Commit 24377101 authored by Jean Delvare's avatar Jean Delvare Committed by Jean Delvare

hwmon: (w83795) Use standard attributes for chassis intrusion

Follow the standard attribute naming for the chassis intrusion
feature. I couldn't test the beeping (my board apparently doesn't do
that) but the alarm works fine.
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Acked-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
parent 00030af2
...@@ -713,7 +713,7 @@ store_beep(struct device *dev, struct device_attribute *attr, ...@@ -713,7 +713,7 @@ store_beep(struct device *dev, struct device_attribute *attr,
return count; return count;
} }
/* Write any value to clear chassis alarm */ /* Write 0 to clear chassis alarm */
static ssize_t static ssize_t
store_chassis_clear(struct device *dev, store_chassis_clear(struct device *dev,
struct device_attribute *attr, const char *buf, struct device_attribute *attr, const char *buf,
...@@ -721,7 +721,10 @@ store_chassis_clear(struct device *dev, ...@@ -721,7 +721,10 @@ store_chassis_clear(struct device *dev,
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct w83795_data *data = i2c_get_clientdata(client); struct w83795_data *data = i2c_get_clientdata(client);
u8 val; unsigned long val;
if (strict_strtoul(buf, 10, &val) < 0 || val != 0)
return -EINVAL;
mutex_lock(&data->update_lock); mutex_lock(&data->update_lock);
val = w83795_read(client, W83795_REG_CLR_CHASSIS); val = w83795_read(client, W83795_REG_CLR_CHASSIS);
...@@ -1709,8 +1712,10 @@ static const struct sensor_device_attribute_2 w83795_pwm[][7] = { ...@@ -1709,8 +1712,10 @@ static const struct sensor_device_attribute_2 w83795_pwm[][7] = {
}; };
static const struct sensor_device_attribute_2 sda_single_files[] = { static const struct sensor_device_attribute_2 sda_single_files[] = {
SENSOR_ATTR_2(chassis, S_IWUSR | S_IRUGO, show_alarm_beep, SENSOR_ATTR_2(intrusion0_alarm, S_IWUSR | S_IRUGO, show_alarm_beep,
store_chassis_clear, ALARM_STATUS, 46), store_chassis_clear, ALARM_STATUS, 46),
SENSOR_ATTR_2(intrusion0_beep, S_IWUSR | S_IRUGO, show_alarm_beep,
store_beep, BEEP_ENABLE, 46),
SENSOR_ATTR_2(beep_enable, S_IWUSR | S_IRUGO, show_alarm_beep, SENSOR_ATTR_2(beep_enable, S_IWUSR | S_IRUGO, show_alarm_beep,
store_beep, BEEP_ENABLE, 47), store_beep, BEEP_ENABLE, 47),
#ifdef CONFIG_SENSORS_W83795_FANCTRL #ifdef CONFIG_SENSORS_W83795_FANCTRL
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment