summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2018-12-06 13:23:25 -0500
committerGuenter Roeck <linux@roeck-us.net>2018-12-16 18:13:23 -0500
commit5614e26d84a99a83f8b7092f1f68d3b04895506f (patch)
tree61f911b193dca45dddbf26e2efd9fe3043faedab
parenta5c47c0d388b939dd578fd466aa804b7f2445390 (diff)
hwmon: (ltc2945): Auto-convert to use SENSOR_DEVICE_ATTR_{RO, RW, WO}
Conversion was done done using the coccinelle script at https://github.com/groeck/coccinelle-patches/raw/master/hwmon/sensor-devattr-w6.cocci Signed-off-by: Guenter Roeck <linux@roeck-us.net>
-rw-r--r--drivers/hwmon/ltc2945.c121
1 files changed, 50 insertions, 71 deletions
diff --git a/drivers/hwmon/ltc2945.c b/drivers/hwmon/ltc2945.c
index 1b92e4f6e234..f16716a1fead 100644
--- a/drivers/hwmon/ltc2945.c
+++ b/drivers/hwmon/ltc2945.c
@@ -226,7 +226,7 @@ static int ltc2945_val_to_reg(struct device *dev, u8 reg,
226 return val; 226 return val;
227} 227}
228 228
229static ssize_t ltc2945_show_value(struct device *dev, 229static ssize_t ltc2945_value_show(struct device *dev,
230 struct device_attribute *da, char *buf) 230 struct device_attribute *da, char *buf)
231{ 231{
232 struct sensor_device_attribute *attr = to_sensor_dev_attr(da); 232 struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
@@ -238,9 +238,9 @@ static ssize_t ltc2945_show_value(struct device *dev,
238 return snprintf(buf, PAGE_SIZE, "%lld\n", value); 238 return snprintf(buf, PAGE_SIZE, "%lld\n", value);
239} 239}
240 240
241static ssize_t ltc2945_set_value(struct device *dev, 241static ssize_t ltc2945_value_store(struct device *dev,
242 struct device_attribute *da, 242 struct device_attribute *da,
243 const char *buf, size_t count) 243 const char *buf, size_t count)
244{ 244{
245 struct sensor_device_attribute *attr = to_sensor_dev_attr(da); 245 struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
246 struct regmap *regmap = dev_get_drvdata(dev); 246 struct regmap *regmap = dev_get_drvdata(dev);
@@ -273,7 +273,7 @@ static ssize_t ltc2945_set_value(struct device *dev,
273 return ret < 0 ? ret : count; 273 return ret < 0 ? ret : count;
274} 274}
275 275
276static ssize_t ltc2945_reset_history(struct device *dev, 276static ssize_t ltc2945_history_store(struct device *dev,
277 struct device_attribute *da, 277 struct device_attribute *da,
278 const char *buf, size_t count) 278 const char *buf, size_t count)
279{ 279{
@@ -326,7 +326,7 @@ static ssize_t ltc2945_reset_history(struct device *dev,
326 return ret ? : count; 326 return ret ? : count;
327} 327}
328 328
329static ssize_t ltc2945_show_bool(struct device *dev, 329static ssize_t ltc2945_bool_show(struct device *dev,
330 struct device_attribute *da, char *buf) 330 struct device_attribute *da, char *buf)
331{ 331{
332 struct sensor_device_attribute *attr = to_sensor_dev_attr(da); 332 struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
@@ -347,86 +347,65 @@ static ssize_t ltc2945_show_bool(struct device *dev,
347 347
348/* Input voltages */ 348/* Input voltages */
349 349
350static SENSOR_DEVICE_ATTR(in1_input, S_IRUGO, ltc2945_show_value, NULL, 350static SENSOR_DEVICE_ATTR_RO(in1_input, ltc2945_value, LTC2945_VIN_H);
351 LTC2945_VIN_H); 351static SENSOR_DEVICE_ATTR_RW(in1_min, ltc2945_value, LTC2945_MIN_VIN_THRES_H);
352static SENSOR_DEVICE_ATTR(in1_min, S_IRUGO | S_IWUSR, ltc2945_show_value, 352static SENSOR_DEVICE_ATTR_RW(in1_max, ltc2945_value, LTC2945_MAX_VIN_THRES_H);
353 ltc2945_set_value, LTC2945_MIN_VIN_THRES_H); 353static SENSOR_DEVICE_ATTR_RO(in1_lowest, ltc2945_value, LTC2945_MIN_VIN_H);
354static SENSOR_DEVICE_ATTR(in1_max, S_IRUGO | S_IWUSR, ltc2945_show_value, 354static SENSOR_DEVICE_ATTR_RO(in1_highest, ltc2945_value, LTC2945_MAX_VIN_H);
355 ltc2945_set_value, LTC2945_MAX_VIN_THRES_H); 355static SENSOR_DEVICE_ATTR_WO(in1_reset_history, ltc2945_history,
356static SENSOR_DEVICE_ATTR(in1_lowest, S_IRUGO, ltc2945_show_value, NULL, 356 LTC2945_MIN_VIN_H);
357 LTC2945_MIN_VIN_H); 357
358static SENSOR_DEVICE_ATTR(in1_highest, S_IRUGO, ltc2945_show_value, NULL, 358static SENSOR_DEVICE_ATTR_RO(in2_input, ltc2945_value, LTC2945_ADIN_H);
359 LTC2945_MAX_VIN_H); 359static SENSOR_DEVICE_ATTR_RW(in2_min, ltc2945_value, LTC2945_MIN_ADIN_THRES_H);
360static SENSOR_DEVICE_ATTR(in1_reset_history, S_IWUSR, NULL, 360static SENSOR_DEVICE_ATTR_RW(in2_max, ltc2945_value, LTC2945_MAX_ADIN_THRES_H);
361 ltc2945_reset_history, LTC2945_MIN_VIN_H); 361static SENSOR_DEVICE_ATTR_RO(in2_lowest, ltc2945_value, LTC2945_MIN_ADIN_H);
362 362static SENSOR_DEVICE_ATTR_RO(in2_highest, ltc2945_value, LTC2945_MAX_ADIN_H);
363static SENSOR_DEVICE_ATTR(in2_input, S_IRUGO, ltc2945_show_value, NULL, 363static SENSOR_DEVICE_ATTR_WO(in2_reset_history, ltc2945_history,
364 LTC2945_ADIN_H); 364 LTC2945_MIN_ADIN_H);
365static SENSOR_DEVICE_ATTR(in2_min, S_IRUGO | S_IWUSR, ltc2945_show_value,
366 ltc2945_set_value, LTC2945_MIN_ADIN_THRES_H);
367static SENSOR_DEVICE_ATTR(in2_max, S_IRUGO | S_IWUSR, ltc2945_show_value,
368 ltc2945_set_value, LTC2945_MAX_ADIN_THRES_H);
369static SENSOR_DEVICE_ATTR(in2_lowest, S_IRUGO, ltc2945_show_value, NULL,
370 LTC2945_MIN_ADIN_H);
371static SENSOR_DEVICE_ATTR(in2_highest, S_IRUGO, ltc2945_show_value, NULL,
372 LTC2945_MAX_ADIN_H);
373static SENSOR_DEVICE_ATTR(in2_reset_history, S_IWUSR, NULL,
374 ltc2945_reset_history, LTC2945_MIN_ADIN_H);
375 365
376/* Voltage alarms */ 366/* Voltage alarms */
377 367
378static SENSOR_DEVICE_ATTR(in1_min_alarm, S_IRUGO, ltc2945_show_bool, NULL, 368static SENSOR_DEVICE_ATTR_RO(in1_min_alarm, ltc2945_bool, FAULT_VIN_UV);
379 FAULT_VIN_UV); 369static SENSOR_DEVICE_ATTR_RO(in1_max_alarm, ltc2945_bool, FAULT_VIN_OV);
380static SENSOR_DEVICE_ATTR(in1_max_alarm, S_IRUGO, ltc2945_show_bool, NULL, 370static SENSOR_DEVICE_ATTR_RO(in2_min_alarm, ltc2945_bool, FAULT_ADIN_UV);
381 FAULT_VIN_OV); 371static SENSOR_DEVICE_ATTR_RO(in2_max_alarm, ltc2945_bool, FAULT_ADIN_OV);
382static SENSOR_DEVICE_ATTR(in2_min_alarm, S_IRUGO, ltc2945_show_bool, NULL,
383 FAULT_ADIN_UV);
384static SENSOR_DEVICE_ATTR(in2_max_alarm, S_IRUGO, ltc2945_show_bool, NULL,
385 FAULT_ADIN_OV);
386 372
387/* Currents (via sense resistor) */ 373/* Currents (via sense resistor) */
388 374
389static SENSOR_DEVICE_ATTR(curr1_input, S_IRUGO, ltc2945_show_value, NULL, 375static SENSOR_DEVICE_ATTR_RO(curr1_input, ltc2945_value, LTC2945_SENSE_H);
390 LTC2945_SENSE_H); 376static SENSOR_DEVICE_ATTR_RW(curr1_min, ltc2945_value,
391static SENSOR_DEVICE_ATTR(curr1_min, S_IRUGO | S_IWUSR, ltc2945_show_value, 377 LTC2945_MIN_SENSE_THRES_H);
392 ltc2945_set_value, LTC2945_MIN_SENSE_THRES_H); 378static SENSOR_DEVICE_ATTR_RW(curr1_max, ltc2945_value,
393static SENSOR_DEVICE_ATTR(curr1_max, S_IRUGO | S_IWUSR, ltc2945_show_value, 379 LTC2945_MAX_SENSE_THRES_H);
394 ltc2945_set_value, LTC2945_MAX_SENSE_THRES_H); 380static SENSOR_DEVICE_ATTR_RO(curr1_lowest, ltc2945_value, LTC2945_MIN_SENSE_H);
395static SENSOR_DEVICE_ATTR(curr1_lowest, S_IRUGO, ltc2945_show_value, NULL, 381static SENSOR_DEVICE_ATTR_RO(curr1_highest, ltc2945_value,
396 LTC2945_MIN_SENSE_H); 382 LTC2945_MAX_SENSE_H);
397static SENSOR_DEVICE_ATTR(curr1_highest, S_IRUGO, ltc2945_show_value, NULL, 383static SENSOR_DEVICE_ATTR_WO(curr1_reset_history, ltc2945_history,
398 LTC2945_MAX_SENSE_H); 384 LTC2945_MIN_SENSE_H);
399static SENSOR_DEVICE_ATTR(curr1_reset_history, S_IWUSR, NULL,
400 ltc2945_reset_history, LTC2945_MIN_SENSE_H);
401 385
402/* Current alarms */ 386/* Current alarms */
403 387
404static SENSOR_DEVICE_ATTR(curr1_min_alarm, S_IRUGO, ltc2945_show_bool, NULL, 388static SENSOR_DEVICE_ATTR_RO(curr1_min_alarm, ltc2945_bool, FAULT_SENSE_UV);
405 FAULT_SENSE_UV); 389static SENSOR_DEVICE_ATTR_RO(curr1_max_alarm, ltc2945_bool, FAULT_SENSE_OV);
406static SENSOR_DEVICE_ATTR(curr1_max_alarm, S_IRUGO, ltc2945_show_bool, NULL,
407 FAULT_SENSE_OV);
408 390
409/* Power */ 391/* Power */
410 392
411static SENSOR_DEVICE_ATTR(power1_input, S_IRUGO, ltc2945_show_value, NULL, 393static SENSOR_DEVICE_ATTR_RO(power1_input, ltc2945_value, LTC2945_POWER_H);
412 LTC2945_POWER_H); 394static SENSOR_DEVICE_ATTR_RW(power1_min, ltc2945_value,
413static SENSOR_DEVICE_ATTR(power1_min, S_IRUGO | S_IWUSR, ltc2945_show_value, 395 LTC2945_MIN_POWER_THRES_H);
414 ltc2945_set_value, LTC2945_MIN_POWER_THRES_H); 396static SENSOR_DEVICE_ATTR_RW(power1_max, ltc2945_value,
415static SENSOR_DEVICE_ATTR(power1_max, S_IRUGO | S_IWUSR, ltc2945_show_value, 397 LTC2945_MAX_POWER_THRES_H);
416 ltc2945_set_value, LTC2945_MAX_POWER_THRES_H); 398static SENSOR_DEVICE_ATTR_RO(power1_input_lowest, ltc2945_value,
417static SENSOR_DEVICE_ATTR(power1_input_lowest, S_IRUGO, ltc2945_show_value, 399 LTC2945_MIN_POWER_H);
418 NULL, LTC2945_MIN_POWER_H); 400static SENSOR_DEVICE_ATTR_RO(power1_input_highest, ltc2945_value,
419static SENSOR_DEVICE_ATTR(power1_input_highest, S_IRUGO, ltc2945_show_value, 401 LTC2945_MAX_POWER_H);
420 NULL, LTC2945_MAX_POWER_H); 402static SENSOR_DEVICE_ATTR_WO(power1_reset_history, ltc2945_history,
421static SENSOR_DEVICE_ATTR(power1_reset_history, S_IWUSR, NULL, 403 LTC2945_MIN_POWER_H);
422 ltc2945_reset_history, LTC2945_MIN_POWER_H);
423 404
424/* Power alarms */ 405/* Power alarms */
425 406
426static SENSOR_DEVICE_ATTR(power1_min_alarm, S_IRUGO, ltc2945_show_bool, NULL, 407static SENSOR_DEVICE_ATTR_RO(power1_min_alarm, ltc2945_bool, FAULT_POWER_UV);
427 FAULT_POWER_UV); 408static SENSOR_DEVICE_ATTR_RO(power1_max_alarm, ltc2945_bool, FAULT_POWER_OV);
428static SENSOR_DEVICE_ATTR(power1_max_alarm, S_IRUGO, ltc2945_show_bool, NULL,
429 FAULT_POWER_OV);
430 409
431static struct attribute *ltc2945_attrs[] = { 410static struct attribute *ltc2945_attrs[] = {
432 &sensor_dev_attr_in1_input.dev_attr.attr, 411 &sensor_dev_attr_in1_input.dev_attr.attr,