Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7817a39e65f04abe136d94a65fa26b7fe3334a1f

Authored by Jean Delvare
Committed by Mark M. Hoffman
1 parent 32c82a9347
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

hwmon: Fault files naming convention 

We have the following naming convention documented in
Documentation/hwmon/sysfs-interface for fault files:

in[0-*]_input_fault
fan[1-*]_input_fault
temp[1-*]_input_fault

Some drivers follow this convention (lm63, lm83, lm90, smsc47m192).
However some drivers omit the "input" part and create files named
fan1_fault (pc87427) or temp1_fault (dme1737). And the new "generic"
libsensors follows this second (non-standard) convention, so it fails
to report fault conditions for drivers which follow the standard.

We want a single naming scheme, and everyone seems to prefer the
shorter variant, so let's go for it.

Signed-off-by: Jean Delvare <khali@linux-fr.org>

Showing 5 changed files with 17 additions and 17 deletions Side-by-side Diff

Documentation/hwmon/sysfs-interface
Diff comments   View file @ 7817a39
... ... @@ -343,9 +343,9 @@
343 343 supports it. When this boolean has value 1, the measurement for that
344 344 channel should not be trusted.
345 345  
346   -in[0-*]_input_fault
347   -fan[1-*]_input_fault
348   -temp[1-*]_input_fault
  346 +in[0-*]_fault
  347 +fan[1-*]_fault
  348 +temp[1-*]_fault
349 349 Input fault condition
350 350 0: no fault occured
351 351 1: fault condition
drivers/hwmon/lm63.c
Diff comments   View file @ 7817a39
... ... @@ -364,7 +364,7 @@
364 364 /* Individual alarm files */
365 365 static SENSOR_DEVICE_ATTR(fan1_min_alarm, S_IRUGO, show_alarm, NULL, 0);
366 366 static SENSOR_DEVICE_ATTR(temp2_crit_alarm, S_IRUGO, show_alarm, NULL, 1);
367   -static SENSOR_DEVICE_ATTR(temp2_input_fault, S_IRUGO, show_alarm, NULL, 2);
  367 +static SENSOR_DEVICE_ATTR(temp2_fault, S_IRUGO, show_alarm, NULL, 2);
368 368 static SENSOR_DEVICE_ATTR(temp2_min_alarm, S_IRUGO, show_alarm, NULL, 3);
369 369 static SENSOR_DEVICE_ATTR(temp2_max_alarm, S_IRUGO, show_alarm, NULL, 4);
370 370 static SENSOR_DEVICE_ATTR(temp1_max_alarm, S_IRUGO, show_alarm, NULL, 6);
... ... @@ -383,7 +383,7 @@
383 383 &dev_attr_temp2_crit_hyst.attr,
384 384  
385 385 &sensor_dev_attr_temp2_crit_alarm.dev_attr.attr,
386   - &sensor_dev_attr_temp2_input_fault.dev_attr.attr,
  386 + &sensor_dev_attr_temp2_fault.dev_attr.attr,
387 387 &sensor_dev_attr_temp2_min_alarm.dev_attr.attr,
388 388 &sensor_dev_attr_temp2_max_alarm.dev_attr.attr,
389 389 &sensor_dev_attr_temp1_max_alarm.dev_attr.attr,
drivers/hwmon/lm83.c
Diff comments   View file @ 7817a39
... ... @@ -223,14 +223,14 @@
223 223 /* Individual alarm files */
224 224 static SENSOR_DEVICE_ATTR(temp1_crit_alarm, S_IRUGO, show_alarm, NULL, 0);
225 225 static SENSOR_DEVICE_ATTR(temp3_crit_alarm, S_IRUGO, show_alarm, NULL, 1);
226   -static SENSOR_DEVICE_ATTR(temp3_input_fault, S_IRUGO, show_alarm, NULL, 2);
  226 +static SENSOR_DEVICE_ATTR(temp3_fault, S_IRUGO, show_alarm, NULL, 2);
227 227 static SENSOR_DEVICE_ATTR(temp3_max_alarm, S_IRUGO, show_alarm, NULL, 4);
228 228 static SENSOR_DEVICE_ATTR(temp1_max_alarm, S_IRUGO, show_alarm, NULL, 6);
229 229 static SENSOR_DEVICE_ATTR(temp2_crit_alarm, S_IRUGO, show_alarm, NULL, 8);
230 230 static SENSOR_DEVICE_ATTR(temp4_crit_alarm, S_IRUGO, show_alarm, NULL, 9);
231   -static SENSOR_DEVICE_ATTR(temp4_input_fault, S_IRUGO, show_alarm, NULL, 10);
  231 +static SENSOR_DEVICE_ATTR(temp4_fault, S_IRUGO, show_alarm, NULL, 10);
232 232 static SENSOR_DEVICE_ATTR(temp4_max_alarm, S_IRUGO, show_alarm, NULL, 12);
233   -static SENSOR_DEVICE_ATTR(temp2_input_fault, S_IRUGO, show_alarm, NULL, 13);
  233 +static SENSOR_DEVICE_ATTR(temp2_fault, S_IRUGO, show_alarm, NULL, 13);
234 234 static SENSOR_DEVICE_ATTR(temp2_max_alarm, S_IRUGO, show_alarm, NULL, 15);
235 235 /* Raw alarm file for compatibility */
236 236 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
... ... @@ -245,7 +245,7 @@
245 245  
246 246 &sensor_dev_attr_temp1_crit_alarm.dev_attr.attr,
247 247 &sensor_dev_attr_temp3_crit_alarm.dev_attr.attr,
248   - &sensor_dev_attr_temp3_input_fault.dev_attr.attr,
  248 + &sensor_dev_attr_temp3_fault.dev_attr.attr,
249 249 &sensor_dev_attr_temp3_max_alarm.dev_attr.attr,
250 250 &sensor_dev_attr_temp1_max_alarm.dev_attr.attr,
251 251 &dev_attr_alarms.attr,
252 252  
... ... @@ -266,9 +266,9 @@
266 266  
267 267 &sensor_dev_attr_temp2_crit_alarm.dev_attr.attr,
268 268 &sensor_dev_attr_temp4_crit_alarm.dev_attr.attr,
269   - &sensor_dev_attr_temp4_input_fault.dev_attr.attr,
  269 + &sensor_dev_attr_temp4_fault.dev_attr.attr,
270 270 &sensor_dev_attr_temp4_max_alarm.dev_attr.attr,
271   - &sensor_dev_attr_temp2_input_fault.dev_attr.attr,
  271 + &sensor_dev_attr_temp2_fault.dev_attr.attr,
272 272 &sensor_dev_attr_temp2_max_alarm.dev_attr.attr,
273 273 NULL
274 274 };
drivers/hwmon/lm90.c
Diff comments   View file @ 7817a39
... ... @@ -371,7 +371,7 @@
371 371 /* Individual alarm files */
372 372 static SENSOR_DEVICE_ATTR(temp1_crit_alarm, S_IRUGO, show_alarm, NULL, 0);
373 373 static SENSOR_DEVICE_ATTR(temp2_crit_alarm, S_IRUGO, show_alarm, NULL, 1);
374   -static SENSOR_DEVICE_ATTR(temp2_input_fault, S_IRUGO, show_alarm, NULL, 2);
  374 +static SENSOR_DEVICE_ATTR(temp2_fault, S_IRUGO, show_alarm, NULL, 2);
375 375 static SENSOR_DEVICE_ATTR(temp2_min_alarm, S_IRUGO, show_alarm, NULL, 3);
376 376 static SENSOR_DEVICE_ATTR(temp2_max_alarm, S_IRUGO, show_alarm, NULL, 4);
377 377 static SENSOR_DEVICE_ATTR(temp1_min_alarm, S_IRUGO, show_alarm, NULL, 5);
... ... @@ -393,7 +393,7 @@
393 393  
394 394 &sensor_dev_attr_temp1_crit_alarm.dev_attr.attr,
395 395 &sensor_dev_attr_temp2_crit_alarm.dev_attr.attr,
396   - &sensor_dev_attr_temp2_input_fault.dev_attr.attr,
  396 + &sensor_dev_attr_temp2_fault.dev_attr.attr,
397 397 &sensor_dev_attr_temp2_min_alarm.dev_attr.attr,
398 398 &sensor_dev_attr_temp2_max_alarm.dev_attr.attr,
399 399 &sensor_dev_attr_temp1_min_alarm.dev_attr.attr,
drivers/hwmon/smsc47m192.c
Diff comments   View file @ 7817a39
... ... @@ -361,8 +361,8 @@
361 361 static SENSOR_DEVICE_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL, 0x0010);
362 362 static SENSOR_DEVICE_ATTR(temp2_alarm, S_IRUGO, show_alarm, NULL, 0x0020);
363 363 static SENSOR_DEVICE_ATTR(temp3_alarm, S_IRUGO, show_alarm, NULL, 0x0040);
364   -static SENSOR_DEVICE_ATTR(temp2_input_fault, S_IRUGO, show_alarm, NULL, 0x4000);
365   -static SENSOR_DEVICE_ATTR(temp3_input_fault, S_IRUGO, show_alarm, NULL, 0x8000);
  364 +static SENSOR_DEVICE_ATTR(temp2_fault, S_IRUGO, show_alarm, NULL, 0x4000);
  365 +static SENSOR_DEVICE_ATTR(temp3_fault, S_IRUGO, show_alarm, NULL, 0x8000);
366 366 static SENSOR_DEVICE_ATTR(in0_alarm, S_IRUGO, show_alarm, NULL, 0x0001);
367 367 static SENSOR_DEVICE_ATTR(in1_alarm, S_IRUGO, show_alarm, NULL, 0x0002);
368 368 static SENSOR_DEVICE_ATTR(in2_alarm, S_IRUGO, show_alarm, NULL, 0x0004);
369 369  
... ... @@ -412,13 +412,13 @@
412 412 &sensor_dev_attr_temp2_min.dev_attr.attr,
413 413 &sensor_dev_attr_temp2_offset.dev_attr.attr,
414 414 &sensor_dev_attr_temp2_alarm.dev_attr.attr,
415   - &sensor_dev_attr_temp2_input_fault.dev_attr.attr,
  415 + &sensor_dev_attr_temp2_fault.dev_attr.attr,
416 416 &sensor_dev_attr_temp3_input.dev_attr.attr,
417 417 &sensor_dev_attr_temp3_max.dev_attr.attr,
418 418 &sensor_dev_attr_temp3_min.dev_attr.attr,
419 419 &sensor_dev_attr_temp3_offset.dev_attr.attr,
420 420 &sensor_dev_attr_temp3_alarm.dev_attr.attr,
421   - &sensor_dev_attr_temp3_input_fault.dev_attr.attr,
  421 + &sensor_dev_attr_temp3_fault.dev_attr.attr,
422 422  
423 423 &dev_attr_cpu0_vid.attr,
424 424 &dev_attr_vrm.attr,