Commit b0c130fd authored by Guenter Roeck's avatar Guenter Roeck
Browse files

hwmon: (adcxx) Use permission specific SENSOR[_DEVICE]_ATTR variants 

Use SENSOR[_DEVICE]_ATTR[_2]_{RO,RW,WO} to simplify the source code,
to improve readbility, and to reduce the chance of inconsistencies.

Also replace any remaining S_<PERMS> in the driver with octal values.

The conversion was done automatically with coccinelle. The semantic patches
and the scripts used to generate this commit log are available at
https://github.com/groeck/coccinelle-patches/hwmon/

.

This patch does not introduce functional changes. It was verified by
compiling the old and new files and comparing text and data sizes.

Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 0594462f

drivers/hwmon/adcxx.c

+22 −22
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ struct adcxx { 
};



/* sysfs hook function */

static ssize_t adcxx_read(struct device *dev,

static ssize_t adcxx_show(struct device *dev,

			  struct device_attribute *devattr, char *buf)

{

	struct spi_device *spi = to_spi_device(dev);
@@ -94,14 +94,14 @@ out: 
	return status;

}



static ssize_t adcxx_show_min(struct device *dev,

static ssize_t adcxx_min_show(struct device *dev,

			      struct device_attribute *devattr, char *buf)

{

	/* The minimum reference is 0 for this chip family */

	return sprintf(buf, "0\n");

}



static ssize_t adcxx_show_max(struct device *dev,

static ssize_t adcxx_max_show(struct device *dev,

			      struct device_attribute *devattr, char *buf)

{

	struct spi_device *spi = to_spi_device(dev);
@@ -118,8 +118,9 @@ static ssize_t adcxx_show_max(struct device *dev, 
	return sprintf(buf, "%d\n", reference);

}



static ssize_t adcxx_set_max(struct device *dev,

	struct device_attribute *devattr, const char *buf, size_t count)

static ssize_t adcxx_max_store(struct device *dev,

			       struct device_attribute *devattr,

			       const char *buf, size_t count)

{

	struct spi_device *spi = to_spi_device(dev);

	struct adcxx *adc = spi_get_drvdata(spi);
@@ -138,25 +139,24 @@ static ssize_t adcxx_set_max(struct device *dev, 
	return count;

}



static ssize_t adcxx_show_name(struct device *dev, struct device_attribute

			      *devattr, char *buf)

static ssize_t adcxx_name_show(struct device *dev,

			       struct device_attribute *devattr, char *buf)

{

	return sprintf(buf, "%s\n", to_spi_device(dev)->modalias);

}



static struct sensor_device_attribute ad_input[] = {

	SENSOR_ATTR(name, S_IRUGO, adcxx_show_name, NULL, 0),

	SENSOR_ATTR(in_min, S_IRUGO, adcxx_show_min, NULL, 0),

	SENSOR_ATTR(in_max, S_IWUSR | S_IRUGO, adcxx_show_max,

					adcxx_set_max, 0),

	SENSOR_ATTR(in0_input, S_IRUGO, adcxx_read, NULL, 0),

	SENSOR_ATTR(in1_input, S_IRUGO, adcxx_read, NULL, 1),

	SENSOR_ATTR(in2_input, S_IRUGO, adcxx_read, NULL, 2),

	SENSOR_ATTR(in3_input, S_IRUGO, adcxx_read, NULL, 3),

	SENSOR_ATTR(in4_input, S_IRUGO, adcxx_read, NULL, 4),

	SENSOR_ATTR(in5_input, S_IRUGO, adcxx_read, NULL, 5),

	SENSOR_ATTR(in6_input, S_IRUGO, adcxx_read, NULL, 6),

	SENSOR_ATTR(in7_input, S_IRUGO, adcxx_read, NULL, 7),

	SENSOR_ATTR_RO(name, adcxx_name, 0),

	SENSOR_ATTR_RO(in_min, adcxx_min, 0),

	SENSOR_ATTR_RW(in_max, adcxx_max, 0),

	SENSOR_ATTR_RO(in0_input, adcxx, 0),

	SENSOR_ATTR_RO(in1_input, adcxx, 1),

	SENSOR_ATTR_RO(in2_input, adcxx, 2),

	SENSOR_ATTR_RO(in3_input, adcxx, 3),

	SENSOR_ATTR_RO(in4_input, adcxx, 4),

	SENSOR_ATTR_RO(in5_input, adcxx, 5),

	SENSOR_ATTR_RO(in6_input, adcxx, 6),

	SENSOR_ATTR_RO(in7_input, adcxx, 7),

};



/*----------------------------------------------------------------------*/

CRA Git | Maintained and supported by SUSTech CRA and CCSE