Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Use SENSOR[_DEVICE]_ATTR[_2]_{RO,RW,WO} to simplify the source code,
to improve readability, 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 fdb97a02

drivers/hwmon/lm83.c

+29 −33
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static struct lm83_data *lm83_update_device(struct device *dev) 
 * Sysfs stuff

 */



static ssize_t show_temp(struct device *dev, struct device_attribute *devattr,

static ssize_t temp_show(struct device *dev, struct device_attribute *devattr,

			 char *buf)

{

	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
@@ -166,8 +166,9 @@ static ssize_t show_temp(struct device *dev, struct device_attribute *devattr, 
	return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[attr->index]));

}



static ssize_t set_temp(struct device *dev, struct device_attribute *devattr,

			const char *buf, size_t count)

static ssize_t temp_store(struct device *dev,

			  struct device_attribute *devattr, const char *buf,

			  size_t count)

{

	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);

	struct lm83_data *data = dev_get_drvdata(dev);
@@ -195,8 +196,8 @@ static ssize_t alarms_show(struct device *dev, struct device_attribute *dummy, 
	return sprintf(buf, "%d\n", data->alarms);

}



static ssize_t show_alarm(struct device *dev, struct device_attribute

			  *devattr, char *buf)

static ssize_t alarm_show(struct device *dev,

			  struct device_attribute *devattr, char *buf)

{

	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);

	struct lm83_data *data = lm83_update_device(dev);
@@ -205,36 +206,31 @@ static ssize_t show_alarm(struct device *dev, struct device_attribute 
	return sprintf(buf, "%d\n", (data->alarms >> bitnr) & 1);

}



static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL, 0);

static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, show_temp, NULL, 1);

static SENSOR_DEVICE_ATTR(temp3_input, S_IRUGO, show_temp, NULL, 2);

static SENSOR_DEVICE_ATTR(temp4_input, S_IRUGO, show_temp, NULL, 3);

static SENSOR_DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp,

	set_temp, 4);

static SENSOR_DEVICE_ATTR(temp2_max, S_IWUSR | S_IRUGO, show_temp,

	set_temp, 5);

static SENSOR_DEVICE_ATTR(temp3_max, S_IWUSR | S_IRUGO, show_temp,

	set_temp, 6);

static SENSOR_DEVICE_ATTR(temp4_max, S_IWUSR | S_IRUGO, show_temp,

	set_temp, 7);

static SENSOR_DEVICE_ATTR(temp1_crit, S_IRUGO, show_temp, NULL, 8);

static SENSOR_DEVICE_ATTR(temp2_crit, S_IRUGO, show_temp, NULL, 8);

static SENSOR_DEVICE_ATTR(temp3_crit, S_IWUSR | S_IRUGO, show_temp,

	set_temp, 8);

static SENSOR_DEVICE_ATTR(temp4_crit, S_IRUGO, show_temp, NULL, 8);

static SENSOR_DEVICE_ATTR_RO(temp1_input, temp, 0);

static SENSOR_DEVICE_ATTR_RO(temp2_input, temp, 1);

static SENSOR_DEVICE_ATTR_RO(temp3_input, temp, 2);

static SENSOR_DEVICE_ATTR_RO(temp4_input, temp, 3);

static SENSOR_DEVICE_ATTR_RW(temp1_max, temp, 4);

static SENSOR_DEVICE_ATTR_RW(temp2_max, temp, 5);

static SENSOR_DEVICE_ATTR_RW(temp3_max, temp, 6);

static SENSOR_DEVICE_ATTR_RW(temp4_max, temp, 7);

static SENSOR_DEVICE_ATTR_RO(temp1_crit, temp, 8);

static SENSOR_DEVICE_ATTR_RO(temp2_crit, temp, 8);

static SENSOR_DEVICE_ATTR_RW(temp3_crit, temp, 8);

static SENSOR_DEVICE_ATTR_RO(temp4_crit, temp, 8);



/* Individual alarm files */

static SENSOR_DEVICE_ATTR(temp1_crit_alarm, S_IRUGO, show_alarm, NULL, 0);

static SENSOR_DEVICE_ATTR(temp3_crit_alarm, S_IRUGO, show_alarm, NULL, 1);

static SENSOR_DEVICE_ATTR(temp3_fault, S_IRUGO, show_alarm, NULL, 2);

static SENSOR_DEVICE_ATTR(temp3_max_alarm, S_IRUGO, show_alarm, NULL, 4);

static SENSOR_DEVICE_ATTR(temp1_max_alarm, S_IRUGO, show_alarm, NULL, 6);

static SENSOR_DEVICE_ATTR(temp2_crit_alarm, S_IRUGO, show_alarm, NULL, 8);

static SENSOR_DEVICE_ATTR(temp4_crit_alarm, S_IRUGO, show_alarm, NULL, 9);

static SENSOR_DEVICE_ATTR(temp4_fault, S_IRUGO, show_alarm, NULL, 10);

static SENSOR_DEVICE_ATTR(temp4_max_alarm, S_IRUGO, show_alarm, NULL, 12);

static SENSOR_DEVICE_ATTR(temp2_fault, S_IRUGO, show_alarm, NULL, 13);

static SENSOR_DEVICE_ATTR(temp2_max_alarm, S_IRUGO, show_alarm, NULL, 15);

static SENSOR_DEVICE_ATTR_RO(temp1_crit_alarm, alarm, 0);

static SENSOR_DEVICE_ATTR_RO(temp3_crit_alarm, alarm, 1);

static SENSOR_DEVICE_ATTR_RO(temp3_fault, alarm, 2);

static SENSOR_DEVICE_ATTR_RO(temp3_max_alarm, alarm, 4);

static SENSOR_DEVICE_ATTR_RO(temp1_max_alarm, alarm, 6);

static SENSOR_DEVICE_ATTR_RO(temp2_crit_alarm, alarm, 8);

static SENSOR_DEVICE_ATTR_RO(temp4_crit_alarm, alarm, 9);

static SENSOR_DEVICE_ATTR_RO(temp4_fault, alarm, 10);

static SENSOR_DEVICE_ATTR_RO(temp4_max_alarm, alarm, 12);

static SENSOR_DEVICE_ATTR_RO(temp2_fault, alarm, 13);

static SENSOR_DEVICE_ATTR_RO(temp2_max_alarm, alarm, 15);

/* Raw alarm file for compatibility */

static DEVICE_ATTR_RO(alarms);