Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

hwmon: (via686a) Add individual alarm files

The new libsensors needs these individual alarm files.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Juerg Haefliger <juergh at gmail.com>
Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>

authored by

Jean Delvare and committed by
Mark M. Hoffman
13ff05e9 1f08af7e

+28
+28
drivers/hwmon/via686a.c
··· 533 533 } 534 534 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL); 535 535 536 + static ssize_t show_alarm(struct device *dev, struct device_attribute *attr, 537 + char *buf) 538 + { 539 + int bitnr = to_sensor_dev_attr(attr)->index; 540 + struct via686a_data *data = via686a_update_device(dev); 541 + return sprintf(buf, "%u\n", (data->alarms >> bitnr) & 1); 542 + } 543 + static SENSOR_DEVICE_ATTR(in0_alarm, S_IRUGO, show_alarm, NULL, 0); 544 + static SENSOR_DEVICE_ATTR(in1_alarm, S_IRUGO, show_alarm, NULL, 1); 545 + static SENSOR_DEVICE_ATTR(in2_alarm, S_IRUGO, show_alarm, NULL, 2); 546 + static SENSOR_DEVICE_ATTR(in3_alarm, S_IRUGO, show_alarm, NULL, 3); 547 + static SENSOR_DEVICE_ATTR(in4_alarm, S_IRUGO, show_alarm, NULL, 8); 548 + static SENSOR_DEVICE_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL, 4); 549 + static SENSOR_DEVICE_ATTR(temp2_alarm, S_IRUGO, show_alarm, NULL, 11); 550 + static SENSOR_DEVICE_ATTR(temp3_alarm, S_IRUGO, show_alarm, NULL, 15); 551 + static SENSOR_DEVICE_ATTR(fan1_alarm, S_IRUGO, show_alarm, NULL, 6); 552 + static SENSOR_DEVICE_ATTR(fan2_alarm, S_IRUGO, show_alarm, NULL, 7); 553 + 536 554 static ssize_t show_name(struct device *dev, struct device_attribute 537 555 *devattr, char *buf) 538 556 { ··· 575 557 &sensor_dev_attr_in2_max.dev_attr.attr, 576 558 &sensor_dev_attr_in3_max.dev_attr.attr, 577 559 &sensor_dev_attr_in4_max.dev_attr.attr, 560 + &sensor_dev_attr_in0_alarm.dev_attr.attr, 561 + &sensor_dev_attr_in1_alarm.dev_attr.attr, 562 + &sensor_dev_attr_in2_alarm.dev_attr.attr, 563 + &sensor_dev_attr_in3_alarm.dev_attr.attr, 564 + &sensor_dev_attr_in4_alarm.dev_attr.attr, 578 565 579 566 &sensor_dev_attr_temp1_input.dev_attr.attr, 580 567 &sensor_dev_attr_temp2_input.dev_attr.attr, ··· 590 567 &sensor_dev_attr_temp1_max_hyst.dev_attr.attr, 591 568 &sensor_dev_attr_temp2_max_hyst.dev_attr.attr, 592 569 &sensor_dev_attr_temp3_max_hyst.dev_attr.attr, 570 + &sensor_dev_attr_temp1_alarm.dev_attr.attr, 571 + &sensor_dev_attr_temp2_alarm.dev_attr.attr, 572 + &sensor_dev_attr_temp3_alarm.dev_attr.attr, 593 573 594 574 &sensor_dev_attr_fan1_input.dev_attr.attr, 595 575 &sensor_dev_attr_fan2_input.dev_attr.attr, ··· 600 574 &sensor_dev_attr_fan2_min.dev_attr.attr, 601 575 &sensor_dev_attr_fan1_div.dev_attr.attr, 602 576 &sensor_dev_attr_fan2_div.dev_attr.attr, 577 + &sensor_dev_attr_fan1_alarm.dev_attr.attr, 578 + &sensor_dev_attr_fan2_alarm.dev_attr.attr, 603 579 604 580 &dev_attr_alarms.attr, 605 581 &dev_attr_name.attr,