From d668a8b022a201e65ec5e301a9e6dff78987550c Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Tue, 15 Mar 2011 16:34:07 -0700 Subject: hwmon: (lineage-pem): Fix in1 voltage alarm sysfs attributes The alarm bit assumed to be a low voltage alarm bit is not set for low voltage alarms, and the alarm bit assumed to be a high voltage alarm turns out to be a general alarm bit which is set for both low and high voltage alarms. Remove the in1_min_alarm sysfs attribute and rename in1_max_alarm to in1_alarm to reflect the situation. Signed-off-by: Guenter Roeck Acked-by: Jean Delvare --- drivers/hwmon/lineage-pem.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'drivers/hwmon') diff --git a/drivers/hwmon/lineage-pem.c b/drivers/hwmon/lineage-pem.c index d39ee24e52f6..58eded27f385 100644 --- a/drivers/hwmon/lineage-pem.c +++ b/drivers/hwmon/lineage-pem.c @@ -345,9 +345,7 @@ static ssize_t pem_show_fan(struct device *dev, struct device_attribute *da, /* Voltages */ static SENSOR_DEVICE_ATTR(in1_input, S_IRUGO, pem_show_data, NULL, PEM_DATA_VOUT_LSB); -static SENSOR_DEVICE_ATTR_2(in1_min_alarm, S_IRUGO, pem_show_bool, NULL, - PEM_DATA_ALARM_2, ALRM2_OV_LOW); -static SENSOR_DEVICE_ATTR_2(in1_max_alarm, S_IRUGO, pem_show_bool, NULL, +static SENSOR_DEVICE_ATTR_2(in1_alarm, S_IRUGO, pem_show_bool, NULL, PEM_DATA_ALARM_1, ALRM1_VOUT_OUT_LIMIT); static SENSOR_DEVICE_ATTR_2(in1_crit_alarm, S_IRUGO, pem_show_bool, NULL, PEM_DATA_ALARM_1, ALRM1_OV_VOLT_SHUTDOWN); @@ -395,8 +393,7 @@ static SENSOR_DEVICE_ATTR_2(temp1_fault, S_IRUGO, pem_show_bool, NULL, static struct attribute *pem_attributes[] = { &sensor_dev_attr_in1_input.dev_attr.attr, - &sensor_dev_attr_in1_min_alarm.dev_attr.attr, - &sensor_dev_attr_in1_max_alarm.dev_attr.attr, + &sensor_dev_attr_in1_alarm.dev_attr.attr, &sensor_dev_attr_in1_crit_alarm.dev_attr.attr, &sensor_dev_attr_in2_alarm.dev_attr.attr, -- cgit v1.2.3