diff options
author | Guenter Roeck <linux@roeck-us.net> | 2018-12-10 17:02:20 -0500 |
---|---|---|
committer | Guenter Roeck <linux@roeck-us.net> | 2019-02-18 17:23:29 -0500 |
commit | 5512eb063e5da4d37f203c0c8b56c7b030bf4337 (patch) | |
tree | 9ee7d85fd6f6d0be28eb99952be5cccd6605ac68 | |
parent | 41c9a49ad338550d3c65a28c253b553d6e5332af (diff) |
hwmon: (sht21) 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/sht21.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/drivers/hwmon/sht21.c b/drivers/hwmon/sht21.c index 2c7ba70921f5..df112b73b635 100644 --- a/drivers/hwmon/sht21.c +++ b/drivers/hwmon/sht21.c | |||
@@ -135,9 +135,9 @@ out: | |||
135 | * Will be called on read access to temp1_input sysfs attribute. | 135 | * Will be called on read access to temp1_input sysfs attribute. |
136 | * Returns number of bytes written into buffer, negative errno on error. | 136 | * Returns number of bytes written into buffer, negative errno on error. |
137 | */ | 137 | */ |
138 | static ssize_t sht21_show_temperature(struct device *dev, | 138 | static ssize_t sht21_temperature_show(struct device *dev, |
139 | struct device_attribute *attr, | 139 | struct device_attribute *attr, |
140 | char *buf) | 140 | char *buf) |
141 | { | 141 | { |
142 | struct sht21 *sht21 = dev_get_drvdata(dev); | 142 | struct sht21 *sht21 = dev_get_drvdata(dev); |
143 | int ret; | 143 | int ret; |
@@ -157,9 +157,8 @@ static ssize_t sht21_show_temperature(struct device *dev, | |||
157 | * Will be called on read access to humidity1_input sysfs attribute. | 157 | * Will be called on read access to humidity1_input sysfs attribute. |
158 | * Returns number of bytes written into buffer, negative errno on error. | 158 | * Returns number of bytes written into buffer, negative errno on error. |
159 | */ | 159 | */ |
160 | static ssize_t sht21_show_humidity(struct device *dev, | 160 | static ssize_t sht21_humidity_show(struct device *dev, |
161 | struct device_attribute *attr, | 161 | struct device_attribute *attr, char *buf) |
162 | char *buf) | ||
163 | { | 162 | { |
164 | struct sht21 *sht21 = dev_get_drvdata(dev); | 163 | struct sht21 *sht21 = dev_get_drvdata(dev); |
165 | int ret; | 164 | int ret; |
@@ -251,10 +250,8 @@ static ssize_t eic_show(struct device *dev, | |||
251 | } | 250 | } |
252 | 251 | ||
253 | /* sysfs attributes */ | 252 | /* sysfs attributes */ |
254 | static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, sht21_show_temperature, | 253 | static SENSOR_DEVICE_ATTR_RO(temp1_input, sht21_temperature, 0); |
255 | NULL, 0); | 254 | static SENSOR_DEVICE_ATTR_RO(humidity1_input, sht21_humidity, 0); |
256 | static SENSOR_DEVICE_ATTR(humidity1_input, S_IRUGO, sht21_show_humidity, | ||
257 | NULL, 0); | ||
258 | static DEVICE_ATTR_RO(eic); | 255 | static DEVICE_ATTR_RO(eic); |
259 | 256 | ||
260 | static struct attribute *sht21_attrs[] = { | 257 | static struct attribute *sht21_attrs[] = { |