OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hwmon: (lm73) 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.

Cc: Guillaume Ligneul <guillaume.ligneul@gmail.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Guenter Roeck 2018-12-10 14:02:11 -08:00
parent 6ccf6a8340
commit 0f875acc93
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/hwmon/lm73.c
View File

@ -62,8 +62,8 @@ struct lm73_data {
/*-----------------------------------------------------------------------*/ /*-----------------------------------------------------------------------*/
static ssize_t set_temp(struct device *dev, struct device_attribute *da, static ssize_t temp_store(struct device *dev, struct device_attribute *da,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct sensor_device_attribute *attr = to_sensor_dev_attr(da); struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
struct lm73_data *data = dev_get_drvdata(dev); struct lm73_data *data = dev_get_drvdata(dev);
@ -81,7 +81,7 @@ static ssize_t set_temp(struct device *dev, struct device_attribute *da,
return (err < 0) ? err : count; return (err < 0) ? err : count;
} }
static ssize_t show_temp(struct device *dev, struct device_attribute *da, static ssize_t temp_show(struct device *dev, struct device_attribute *da,
char *buf) char *buf)
{ {
struct sensor_device_attribute *attr = to_sensor_dev_attr(da); struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
@ -98,8 +98,8 @@ static ssize_t show_temp(struct device *dev, struct device_attribute *da,
return scnprintf(buf, PAGE_SIZE, "%d\n", temp); return scnprintf(buf, PAGE_SIZE, "%d\n", temp);
} }
static ssize_t set_convrate(struct device *dev, struct device_attribute *da, static ssize_t convrate_store(struct device *dev, struct device_attribute *da,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct lm73_data *data = dev_get_drvdata(dev); struct lm73_data *data = dev_get_drvdata(dev);
unsigned long convrate; unsigned long convrate;
@ -133,7 +133,7 @@ static ssize_t set_convrate(struct device *dev, struct device_attribute *da,
return count; return count;
} }
static ssize_t show_convrate(struct device *dev, struct device_attribute *da, static ssize_t convrate_show(struct device *dev, struct device_attribute *da,
char *buf) char *buf)
{ {
struct lm73_data *data = dev_get_drvdata(dev); struct lm73_data *data = dev_get_drvdata(dev);
@ -143,7 +143,7 @@ static ssize_t show_convrate(struct device *dev, struct device_attribute *da,
return scnprintf(buf, PAGE_SIZE, "%hu\n", lm73_convrates[res]); return scnprintf(buf, PAGE_SIZE, "%hu\n", lm73_convrates[res]);
} }
static ssize_t show_maxmin_alarm(struct device *dev, static ssize_t maxmin_alarm_show(struct device *dev,
struct device_attribute *da, char *buf) struct device_attribute *da, char *buf)
{ {
struct sensor_device_attribute *attr = to_sensor_dev_attr(da); struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
@ -168,18 +168,14 @@ abort:
/* sysfs attributes for hwmon */ /* sysfs attributes for hwmon */
static SENSOR_DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, static SENSOR_DEVICE_ATTR_RW(temp1_max, temp, LM73_REG_MAX);
show_temp, set_temp, LM73_REG_MAX); static SENSOR_DEVICE_ATTR_RW(temp1_min, temp, LM73_REG_MIN);
static SENSOR_DEVICE_ATTR(temp1_min, S_IWUSR | S_IRUGO, static SENSOR_DEVICE_ATTR_RO(temp1_input, temp, LM73_REG_INPUT);
show_temp, set_temp, LM73_REG_MIN); static SENSOR_DEVICE_ATTR_RW(update_interval, convrate, 0);
static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, static SENSOR_DEVICE_ATTR_RO(temp1_max_alarm, maxmin_alarm,
show_temp, NULL, LM73_REG_INPUT); LM73_CTRL_HI_SHIFT);
static SENSOR_DEVICE_ATTR(update_interval, S_IWUSR | S_IRUGO, static SENSOR_DEVICE_ATTR_RO(temp1_min_alarm, maxmin_alarm,
show_convrate, set_convrate, 0); LM73_CTRL_LO_SHIFT);
static SENSOR_DEVICE_ATTR(temp1_max_alarm, S_IRUGO,
show_maxmin_alarm, NULL, LM73_CTRL_HI_SHIFT);
static SENSOR_DEVICE_ATTR(temp1_min_alarm, S_IRUGO,
show_maxmin_alarm, NULL, LM73_CTRL_LO_SHIFT);
static struct attribute *lm73_attrs[] = { static struct attribute *lm73_attrs[] = {
&sensor_dev_attr_temp1_input.dev_attr.attr, &sensor_dev_attr_temp1_input.dev_attr.attr,