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

Commit 97b539d5 authored by Guenter Roeck's avatar Guenter Roeck
Browse files

hwmon: (lm77) 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 e6ab6e0e

drivers/hwmon/lm77.c

+21 −24
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static struct lm77_data *lm77_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);
@@ -146,7 +146,7 @@ static ssize_t show_temp(struct device *dev, struct device_attribute *devattr, 
	return sprintf(buf, "%d\n", data->temp[attr->index]);

}



static ssize_t show_temp_hyst(struct device *dev,

static ssize_t temp_hyst_show(struct device *dev,

			      struct device_attribute *devattr, char *buf)

{

	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
@@ -160,8 +160,9 @@ static ssize_t show_temp_hyst(struct device *dev, 
	return sprintf(buf, "%d\n", temp);

}



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 lm77_data *data = dev_get_drvdata(dev);
@@ -186,7 +187,7 @@ static ssize_t set_temp(struct device *dev, struct device_attribute *devattr, 
 * hysteresis is stored as a relative value on the chip, so it has to be

 * converted first.

 */

static ssize_t set_temp_hyst(struct device *dev,

static ssize_t temp_hyst_store(struct device *dev,

			       struct device_attribute *devattr,

			       const char *buf, size_t count)

{
@@ -208,7 +209,7 @@ static ssize_t set_temp_hyst(struct device *dev, 
	return count;

}



static ssize_t show_alarm(struct device *dev, struct device_attribute *attr,

static ssize_t alarm_show(struct device *dev, struct device_attribute *attr,

			  char *buf)

{

	int bitnr = to_sensor_dev_attr(attr)->index;
@@ -216,22 +217,18 @@ static ssize_t show_alarm(struct device *dev, struct device_attribute *attr, 
	return sprintf(buf, "%u\n", (data->alarms >> bitnr) & 1);

}



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

static SENSOR_DEVICE_ATTR(temp1_crit, S_IWUSR | S_IRUGO, show_temp, set_temp,

			  t_crit);

static SENSOR_DEVICE_ATTR(temp1_min, S_IWUSR | S_IRUGO, show_temp, set_temp,

			  t_min);

static SENSOR_DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp, set_temp,

			  t_max);



static SENSOR_DEVICE_ATTR(temp1_crit_hyst, S_IWUSR | S_IRUGO, show_temp_hyst,

			  set_temp_hyst, t_crit);

static SENSOR_DEVICE_ATTR(temp1_min_hyst, S_IRUGO, show_temp_hyst, NULL, t_min);

static SENSOR_DEVICE_ATTR(temp1_max_hyst, S_IRUGO, show_temp_hyst, NULL, t_max);



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

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

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

static SENSOR_DEVICE_ATTR_RO(temp1_input, temp, t_input);

static SENSOR_DEVICE_ATTR_RW(temp1_crit, temp, t_crit);

static SENSOR_DEVICE_ATTR_RW(temp1_min, temp, t_min);

static SENSOR_DEVICE_ATTR_RW(temp1_max, temp, t_max);



static SENSOR_DEVICE_ATTR_RW(temp1_crit_hyst, temp_hyst, t_crit);

static SENSOR_DEVICE_ATTR_RO(temp1_min_hyst, temp_hyst, t_min);

static SENSOR_DEVICE_ATTR_RO(temp1_max_hyst, temp_hyst, t_max);



static SENSOR_DEVICE_ATTR_RO(temp1_crit_alarm, alarm, 2);

static SENSOR_DEVICE_ATTR_RO(temp1_min_alarm, alarm, 0);

static SENSOR_DEVICE_ATTR_RO(temp1_max_alarm, alarm, 1);



static struct attribute *lm77_attrs[] = {

	&sensor_dev_attr_temp1_input.dev_attr.attr,