diff options
author | Guenter Roeck <linux@roeck-us.net> | 2018-12-10 17:02:18 -0500 |
---|---|---|
committer | Guenter Roeck <linux@roeck-us.net> | 2019-02-18 17:23:29 -0500 |
commit | f0faf62c71a9a9a7dfeb76988738de50b517bab1 (patch) | |
tree | 5b18528d877a26cc53b646be6bddb5a618b88ca9 | |
parent | e590be4ab142062b910e1f9138671f9ca7dee0bd (diff) |
hwmon: (nsa320-hwmon) 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: Guenter Roeck <linux@roeck-us.net>
-rw-r--r-- | drivers/hwmon/nsa320-hwmon.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/hwmon/nsa320-hwmon.c b/drivers/hwmon/nsa320-hwmon.c index 5a16109cdea8..f952f803faeb 100644 --- a/drivers/hwmon/nsa320-hwmon.c +++ b/drivers/hwmon/nsa320-hwmon.c | |||
@@ -114,8 +114,8 @@ static s32 nsa320_hwmon_update(struct device *dev) | |||
114 | return mcu_data; | 114 | return mcu_data; |
115 | } | 115 | } |
116 | 116 | ||
117 | static ssize_t show_label(struct device *dev, | 117 | static ssize_t label_show(struct device *dev, struct device_attribute *attr, |
118 | struct device_attribute *attr, char *buf) | 118 | char *buf) |
119 | { | 119 | { |
120 | int channel = to_sensor_dev_attr(attr)->index; | 120 | int channel = to_sensor_dev_attr(attr)->index; |
121 | 121 | ||
@@ -144,9 +144,9 @@ static ssize_t fan1_input_show(struct device *dev, | |||
144 | return sprintf(buf, "%d\n", ((mcu_data & 0xff0000) >> 16) * 100); | 144 | return sprintf(buf, "%d\n", ((mcu_data & 0xff0000) >> 16) * 100); |
145 | } | 145 | } |
146 | 146 | ||
147 | static SENSOR_DEVICE_ATTR(temp1_label, S_IRUGO, show_label, NULL, NSA320_TEMP); | 147 | static SENSOR_DEVICE_ATTR_RO(temp1_label, label, NSA320_TEMP); |
148 | static DEVICE_ATTR_RO(temp1_input); | 148 | static DEVICE_ATTR_RO(temp1_input); |
149 | static SENSOR_DEVICE_ATTR(fan1_label, S_IRUGO, show_label, NULL, NSA320_FAN); | 149 | static SENSOR_DEVICE_ATTR_RO(fan1_label, label, NSA320_FAN); |
150 | static DEVICE_ATTR_RO(fan1_input); | 150 | static DEVICE_ATTR_RO(fan1_input); |
151 | 151 | ||
152 | static struct attribute *nsa320_attrs[] = { | 152 | static struct attribute *nsa320_attrs[] = { |