diff options
Diffstat (limited to 'drivers/hwmon/adm1021.c')
-rw-r--r-- | drivers/hwmon/adm1021.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/hwmon/adm1021.c b/drivers/hwmon/adm1021.c index 1fdcc3e703b9..eacf10fadbc6 100644 --- a/drivers/hwmon/adm1021.c +++ b/drivers/hwmon/adm1021.c | |||
@@ -191,7 +191,7 @@ static ssize_t show_alarm(struct device *dev, struct device_attribute *attr, | |||
191 | return sprintf(buf, "%u\n", (data->alarms >> index) & 1); | 191 | return sprintf(buf, "%u\n", (data->alarms >> index) & 1); |
192 | } | 192 | } |
193 | 193 | ||
194 | static ssize_t show_alarms(struct device *dev, | 194 | static ssize_t alarms_show(struct device *dev, |
195 | struct device_attribute *attr, | 195 | struct device_attribute *attr, |
196 | char *buf) | 196 | char *buf) |
197 | { | 197 | { |
@@ -251,16 +251,16 @@ static ssize_t set_temp_min(struct device *dev, | |||
251 | return count; | 251 | return count; |
252 | } | 252 | } |
253 | 253 | ||
254 | static ssize_t show_low_power(struct device *dev, | 254 | static ssize_t low_power_show(struct device *dev, |
255 | struct device_attribute *devattr, char *buf) | 255 | struct device_attribute *devattr, char *buf) |
256 | { | 256 | { |
257 | struct adm1021_data *data = adm1021_update_device(dev); | 257 | struct adm1021_data *data = adm1021_update_device(dev); |
258 | return sprintf(buf, "%d\n", data->low_power); | 258 | return sprintf(buf, "%d\n", data->low_power); |
259 | } | 259 | } |
260 | 260 | ||
261 | static ssize_t set_low_power(struct device *dev, | 261 | static ssize_t low_power_store(struct device *dev, |
262 | struct device_attribute *devattr, | 262 | struct device_attribute *devattr, |
263 | const char *buf, size_t count) | 263 | const char *buf, size_t count) |
264 | { | 264 | { |
265 | struct adm1021_data *data = dev_get_drvdata(dev); | 265 | struct adm1021_data *data = dev_get_drvdata(dev); |
266 | struct i2c_client *client = data->client; | 266 | struct i2c_client *client = data->client; |
@@ -303,8 +303,8 @@ static SENSOR_DEVICE_ATTR(temp2_max_alarm, S_IRUGO, show_alarm, NULL, 4); | |||
303 | static SENSOR_DEVICE_ATTR(temp2_min_alarm, S_IRUGO, show_alarm, NULL, 3); | 303 | static SENSOR_DEVICE_ATTR(temp2_min_alarm, S_IRUGO, show_alarm, NULL, 3); |
304 | static SENSOR_DEVICE_ATTR(temp2_fault, S_IRUGO, show_alarm, NULL, 2); | 304 | static SENSOR_DEVICE_ATTR(temp2_fault, S_IRUGO, show_alarm, NULL, 2); |
305 | 305 | ||
306 | static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL); | 306 | static DEVICE_ATTR_RO(alarms); |
307 | static DEVICE_ATTR(low_power, S_IWUSR | S_IRUGO, show_low_power, set_low_power); | 307 | static DEVICE_ATTR_RW(low_power); |
308 | 308 | ||
309 | static struct attribute *adm1021_attributes[] = { | 309 | static struct attribute *adm1021_attributes[] = { |
310 | &sensor_dev_attr_temp1_max.dev_attr.attr, | 310 | &sensor_dev_attr_temp1_max.dev_attr.attr, |