summaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/max6650.c
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2016-12-22 07:05:31 -0500
committerGuenter Roeck <linux@roeck-us.net>2017-01-02 13:19:45 -0500
commit1fc673769f9e078bddf213331dc934f21b3181a8 (patch)
treebe193c6c512f0574c99ced4ccef1b1c32ad95429 /drivers/hwmon/max6650.c
parent4cd0183dcf2a9be3338acda63fc4b745f6ef587e (diff)
hwmon: (max6650) use permission-specific DEVICE_ATTR variants
Use DEVICE_ATTR_RW for read/write attributes. This simplifies the source code, improves readbility, and reduces the chance of inconsistencies. The conversion was done automatically using coccinelle. It was validated by compiling both the old and the new source code and comparing its text, data, and bss size. Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> [groeck: Updated description] Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon/max6650.c')
-rw-r--r--drivers/hwmon/max6650.c44
1 files changed, 24 insertions, 20 deletions
diff --git a/drivers/hwmon/max6650.c b/drivers/hwmon/max6650.c
index a993b44ed538..65be4b19fe47 100644
--- a/drivers/hwmon/max6650.c
+++ b/drivers/hwmon/max6650.c
@@ -270,8 +270,8 @@ static ssize_t get_fan(struct device *dev, struct device_attribute *devattr,
270 * controlled. 270 * controlled.
271 */ 271 */
272 272
273static ssize_t get_target(struct device *dev, struct device_attribute *devattr, 273static ssize_t fan1_target_show(struct device *dev,
274 char *buf) 274 struct device_attribute *devattr, char *buf)
275{ 275{
276 struct max6650_data *data = max6650_update_device(dev); 276 struct max6650_data *data = max6650_update_device(dev);
277 int kscale, ktach, rpm; 277 int kscale, ktach, rpm;
@@ -318,8 +318,9 @@ static int max6650_set_target(struct max6650_data *data, unsigned long rpm)
318 data->speed); 318 data->speed);
319} 319}
320 320
321static ssize_t set_target(struct device *dev, struct device_attribute *devattr, 321static ssize_t fan1_target_store(struct device *dev,
322 const char *buf, size_t count) 322 struct device_attribute *devattr,
323 const char *buf, size_t count)
323{ 324{
324 struct max6650_data *data = dev_get_drvdata(dev); 325 struct max6650_data *data = dev_get_drvdata(dev);
325 unsigned long rpm; 326 unsigned long rpm;
@@ -350,8 +351,8 @@ static ssize_t set_target(struct device *dev, struct device_attribute *devattr,
350 * back exactly the value you have set. 351 * back exactly the value you have set.
351 */ 352 */
352 353
353static ssize_t get_pwm(struct device *dev, struct device_attribute *devattr, 354static ssize_t pwm1_show(struct device *dev, struct device_attribute *devattr,
354 char *buf) 355 char *buf)
355{ 356{
356 int pwm; 357 int pwm;
357 struct max6650_data *data = max6650_update_device(dev); 358 struct max6650_data *data = max6650_update_device(dev);
@@ -371,8 +372,9 @@ static ssize_t get_pwm(struct device *dev, struct device_attribute *devattr,
371 return sprintf(buf, "%d\n", pwm); 372 return sprintf(buf, "%d\n", pwm);
372} 373}
373 374
374static ssize_t set_pwm(struct device *dev, struct device_attribute *devattr, 375static ssize_t pwm1_store(struct device *dev,
375 const char *buf, size_t count) 376 struct device_attribute *devattr, const char *buf,
377 size_t count)
376{ 378{
377 struct max6650_data *data = dev_get_drvdata(dev); 379 struct max6650_data *data = dev_get_drvdata(dev);
378 struct i2c_client *client = data->client; 380 struct i2c_client *client = data->client;
@@ -406,8 +408,8 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *devattr,
406 * 2 = Closed loop, RPM for all fans regulated by fan1 tachometer 408 * 2 = Closed loop, RPM for all fans regulated by fan1 tachometer
407 * 3 = Fan off 409 * 3 = Fan off
408 */ 410 */
409static ssize_t get_enable(struct device *dev, struct device_attribute *devattr, 411static ssize_t pwm1_enable_show(struct device *dev,
410 char *buf) 412 struct device_attribute *devattr, char *buf)
411{ 413{
412 struct max6650_data *data = max6650_update_device(dev); 414 struct max6650_data *data = max6650_update_device(dev);
413 int mode = (data->config & MAX6650_CFG_MODE_MASK) >> 4; 415 int mode = (data->config & MAX6650_CFG_MODE_MASK) >> 4;
@@ -416,8 +418,9 @@ static ssize_t get_enable(struct device *dev, struct device_attribute *devattr,
416 return sprintf(buf, "%d\n", sysfs_modes[mode]); 418 return sprintf(buf, "%d\n", sysfs_modes[mode]);
417} 419}
418 420
419static ssize_t set_enable(struct device *dev, struct device_attribute *devattr, 421static ssize_t pwm1_enable_store(struct device *dev,
420 const char *buf, size_t count) 422 struct device_attribute *devattr,
423 const char *buf, size_t count)
421{ 424{
422 struct max6650_data *data = dev_get_drvdata(dev); 425 struct max6650_data *data = dev_get_drvdata(dev);
423 unsigned long mode; 426 unsigned long mode;
@@ -458,16 +461,17 @@ static ssize_t set_enable(struct device *dev, struct device_attribute *devattr,
458 * defined for that. See the data sheet for details. 461 * defined for that. See the data sheet for details.
459 */ 462 */
460 463
461static ssize_t get_div(struct device *dev, struct device_attribute *devattr, 464static ssize_t fan1_div_show(struct device *dev,
462 char *buf) 465 struct device_attribute *devattr, char *buf)
463{ 466{
464 struct max6650_data *data = max6650_update_device(dev); 467 struct max6650_data *data = max6650_update_device(dev);
465 468
466 return sprintf(buf, "%d\n", DIV_FROM_REG(data->count)); 469 return sprintf(buf, "%d\n", DIV_FROM_REG(data->count));
467} 470}
468 471
469static ssize_t set_div(struct device *dev, struct device_attribute *devattr, 472static ssize_t fan1_div_store(struct device *dev,
470 const char *buf, size_t count) 473 struct device_attribute *devattr,
474 const char *buf, size_t count)
471{ 475{
472 struct max6650_data *data = dev_get_drvdata(dev); 476 struct max6650_data *data = dev_get_drvdata(dev);
473 struct i2c_client *client = data->client; 477 struct i2c_client *client = data->client;
@@ -534,10 +538,10 @@ static SENSOR_DEVICE_ATTR(fan1_input, S_IRUGO, get_fan, NULL, 0);
534static SENSOR_DEVICE_ATTR(fan2_input, S_IRUGO, get_fan, NULL, 1); 538static SENSOR_DEVICE_ATTR(fan2_input, S_IRUGO, get_fan, NULL, 1);
535static SENSOR_DEVICE_ATTR(fan3_input, S_IRUGO, get_fan, NULL, 2); 539static SENSOR_DEVICE_ATTR(fan3_input, S_IRUGO, get_fan, NULL, 2);
536static SENSOR_DEVICE_ATTR(fan4_input, S_IRUGO, get_fan, NULL, 3); 540static SENSOR_DEVICE_ATTR(fan4_input, S_IRUGO, get_fan, NULL, 3);
537static DEVICE_ATTR(fan1_target, S_IWUSR | S_IRUGO, get_target, set_target); 541static DEVICE_ATTR_RW(fan1_target);
538static DEVICE_ATTR(fan1_div, S_IWUSR | S_IRUGO, get_div, set_div); 542static DEVICE_ATTR_RW(fan1_div);
539static DEVICE_ATTR(pwm1_enable, S_IWUSR | S_IRUGO, get_enable, set_enable); 543static DEVICE_ATTR_RW(pwm1_enable);
540static DEVICE_ATTR(pwm1, S_IWUSR | S_IRUGO, get_pwm, set_pwm); 544static DEVICE_ATTR_RW(pwm1);
541static SENSOR_DEVICE_ATTR(fan1_max_alarm, S_IRUGO, get_alarm, NULL, 545static SENSOR_DEVICE_ATTR(fan1_max_alarm, S_IRUGO, get_alarm, NULL,
542 MAX6650_ALRM_MAX); 546 MAX6650_ALRM_MAX);
543static SENSOR_DEVICE_ATTR(fan1_min_alarm, S_IRUGO, get_alarm, NULL, 547static SENSOR_DEVICE_ATTR(fan1_min_alarm, S_IRUGO, get_alarm, NULL,
generated by cgit v1.2.2 (git 2.25.0) at 2025-03-11 18:28:26 -0400