diff options
author | Guenter Roeck <linux@roeck-us.net> | 2018-12-10 17:02:22 -0500 |
---|---|---|
committer | Guenter Roeck <linux@roeck-us.net> | 2019-02-18 17:23:29 -0500 |
commit | 69dd7cdbeca3565a4beee0e54f1296080fae7dfd (patch) | |
tree | b85eb8e2cae018d853f2b92ff389eee0731c998b | |
parent | 51148a239aac5dc495326d7e58b656105fc3678b (diff) |
hwmon: (tmp103) 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/tmp103.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/drivers/hwmon/tmp103.c b/drivers/hwmon/tmp103.c index 7f85b14544df..bda0fdc1eb53 100644 --- a/drivers/hwmon/tmp103.c +++ b/drivers/hwmon/tmp103.c | |||
@@ -61,9 +61,8 @@ static inline u8 tmp103_mc_to_reg(int val) | |||
61 | return DIV_ROUND_CLOSEST(val, 1000); | 61 | return DIV_ROUND_CLOSEST(val, 1000); |
62 | } | 62 | } |
63 | 63 | ||
64 | static ssize_t tmp103_show_temp(struct device *dev, | 64 | static ssize_t tmp103_temp_show(struct device *dev, |
65 | struct device_attribute *attr, | 65 | struct device_attribute *attr, char *buf) |
66 | char *buf) | ||
67 | { | 66 | { |
68 | struct sensor_device_attribute *sda = to_sensor_dev_attr(attr); | 67 | struct sensor_device_attribute *sda = to_sensor_dev_attr(attr); |
69 | struct regmap *regmap = dev_get_drvdata(dev); | 68 | struct regmap *regmap = dev_get_drvdata(dev); |
@@ -77,9 +76,9 @@ static ssize_t tmp103_show_temp(struct device *dev, | |||
77 | return sprintf(buf, "%d\n", tmp103_reg_to_mc(regval)); | 76 | return sprintf(buf, "%d\n", tmp103_reg_to_mc(regval)); |
78 | } | 77 | } |
79 | 78 | ||
80 | static ssize_t tmp103_set_temp(struct device *dev, | 79 | static ssize_t tmp103_temp_store(struct device *dev, |
81 | struct device_attribute *attr, | 80 | struct device_attribute *attr, |
82 | const char *buf, size_t count) | 81 | const char *buf, size_t count) |
83 | { | 82 | { |
84 | struct sensor_device_attribute *sda = to_sensor_dev_attr(attr); | 83 | struct sensor_device_attribute *sda = to_sensor_dev_attr(attr); |
85 | struct regmap *regmap = dev_get_drvdata(dev); | 84 | struct regmap *regmap = dev_get_drvdata(dev); |
@@ -94,14 +93,11 @@ static ssize_t tmp103_set_temp(struct device *dev, | |||
94 | return ret ? ret : count; | 93 | return ret ? ret : count; |
95 | } | 94 | } |
96 | 95 | ||
97 | static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, tmp103_show_temp, NULL , | 96 | static SENSOR_DEVICE_ATTR_RO(temp1_input, tmp103_temp, TMP103_TEMP_REG); |
98 | TMP103_TEMP_REG); | ||
99 | 97 | ||
100 | static SENSOR_DEVICE_ATTR(temp1_min, S_IWUSR | S_IRUGO, tmp103_show_temp, | 98 | static SENSOR_DEVICE_ATTR_RW(temp1_min, tmp103_temp, TMP103_TLOW_REG); |
101 | tmp103_set_temp, TMP103_TLOW_REG); | ||
102 | 99 | ||
103 | static SENSOR_DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, tmp103_show_temp, | 100 | static SENSOR_DEVICE_ATTR_RW(temp1_max, tmp103_temp, TMP103_THIGH_REG); |
104 | tmp103_set_temp, TMP103_THIGH_REG); | ||
105 | 101 | ||
106 | static struct attribute *tmp103_attrs[] = { | 102 | static struct attribute *tmp103_attrs[] = { |
107 | &sensor_dev_attr_temp1_input.dev_attr.attr, | 103 | &sensor_dev_attr_temp1_input.dev_attr.attr, |