Commit 12211301 authored by Guenter Roeck's avatar Guenter Roeck

hwmon: (i5500_temp) 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 0d87116f
...@@ -58,7 +58,7 @@ static ssize_t temp1_input_show(struct device *dev, ...@@ -58,7 +58,7 @@ static ssize_t temp1_input_show(struct device *dev,
return sprintf(buf, "%ld\n", temp); return sprintf(buf, "%ld\n", temp);
} }
static ssize_t show_thresh(struct device *dev, static ssize_t thresh_show(struct device *dev,
struct device_attribute *devattr, char *buf) struct device_attribute *devattr, char *buf)
{ {
struct pci_dev *pdev = to_pci_dev(dev->parent); struct pci_dev *pdev = to_pci_dev(dev->parent);
...@@ -72,7 +72,7 @@ static ssize_t show_thresh(struct device *dev, ...@@ -72,7 +72,7 @@ static ssize_t show_thresh(struct device *dev,
return sprintf(buf, "%ld\n", temp); return sprintf(buf, "%ld\n", temp);
} }
static ssize_t show_alarm(struct device *dev, static ssize_t alarm_show(struct device *dev,
struct device_attribute *devattr, char *buf) struct device_attribute *devattr, char *buf)
{ {
struct pci_dev *pdev = to_pci_dev(dev->parent); struct pci_dev *pdev = to_pci_dev(dev->parent);
...@@ -84,11 +84,11 @@ static ssize_t show_alarm(struct device *dev, ...@@ -84,11 +84,11 @@ static ssize_t show_alarm(struct device *dev,
} }
static DEVICE_ATTR_RO(temp1_input); static DEVICE_ATTR_RO(temp1_input);
static SENSOR_DEVICE_ATTR(temp1_crit, S_IRUGO, show_thresh, NULL, 0xE2); static SENSOR_DEVICE_ATTR_RO(temp1_crit, thresh, 0xE2);
static SENSOR_DEVICE_ATTR(temp1_max_hyst, S_IRUGO, show_thresh, NULL, 0xEC); static SENSOR_DEVICE_ATTR_RO(temp1_max_hyst, thresh, 0xEC);
static SENSOR_DEVICE_ATTR(temp1_max, S_IRUGO, show_thresh, NULL, 0xEE); static SENSOR_DEVICE_ATTR_RO(temp1_max, thresh, 0xEE);
static SENSOR_DEVICE_ATTR(temp1_crit_alarm, S_IRUGO, show_alarm, NULL, 0); static SENSOR_DEVICE_ATTR_RO(temp1_crit_alarm, alarm, 0);
static SENSOR_DEVICE_ATTR(temp1_max_alarm, S_IRUGO, show_alarm, NULL, 1); static SENSOR_DEVICE_ATTR_RO(temp1_max_alarm, alarm, 1);
static struct attribute *i5500_temp_attrs[] = { static struct attribute *i5500_temp_attrs[] = {
&dev_attr_temp1_input.attr, &dev_attr_temp1_input.attr,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment