diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2012-09-04 21:58:29 -0400 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2012-09-24 00:08:34 -0400 |
| commit | 1a2a064eb8d74260edf23f9592675dd33519350f (patch) | |
| tree | fd110da3717083f8f368a119c7b0da445a5fc4c1 /drivers | |
| parent | 1267ce9c332de174bae82e968e7f821380b2ccdf (diff) | |
hwmon: (w83793) Remove legacy chassis intrusion detection sysfs attributes
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hwmon/w83793.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/drivers/hwmon/w83793.c b/drivers/hwmon/w83793.c index d6b0bdd48651..4fc47e062071 100644 --- a/drivers/hwmon/w83793.c +++ b/drivers/hwmon/w83793.c | |||
| @@ -442,27 +442,6 @@ store_beep_enable(struct device *dev, struct device_attribute *attr, | |||
| 442 | return count; | 442 | return count; |
| 443 | } | 443 | } |
| 444 | 444 | ||
| 445 | /* Write any value to clear chassis alarm */ | ||
| 446 | static ssize_t | ||
| 447 | store_chassis_clear_legacy(struct device *dev, | ||
| 448 | struct device_attribute *attr, const char *buf, | ||
| 449 | size_t count) | ||
| 450 | { | ||
| 451 | struct i2c_client *client = to_i2c_client(dev); | ||
| 452 | struct w83793_data *data = i2c_get_clientdata(client); | ||
| 453 | u8 val; | ||
| 454 | |||
| 455 | dev_warn(dev, "Attribute chassis is deprecated, " | ||
| 456 | "use intrusion0_alarm instead\n"); | ||
| 457 | |||
| 458 | mutex_lock(&data->update_lock); | ||
| 459 | val = w83793_read_value(client, W83793_REG_CLR_CHASSIS); | ||
| 460 | val |= 0x80; | ||
| 461 | w83793_write_value(client, W83793_REG_CLR_CHASSIS, val); | ||
| 462 | mutex_unlock(&data->update_lock); | ||
| 463 | return count; | ||
| 464 | } | ||
| 465 | |||
| 466 | /* Write 0 to clear chassis alarm */ | 445 | /* Write 0 to clear chassis alarm */ |
| 467 | static ssize_t | 446 | static ssize_t |
| 468 | store_chassis_clear(struct device *dev, | 447 | store_chassis_clear(struct device *dev, |
| @@ -1189,8 +1168,6 @@ static struct sensor_device_attribute_2 w83793_vid[] = { | |||
| 1189 | static DEVICE_ATTR(vrm, S_IWUSR | S_IRUGO, show_vrm, store_vrm); | 1168 | static DEVICE_ATTR(vrm, S_IWUSR | S_IRUGO, show_vrm, store_vrm); |
| 1190 | 1169 | ||
| 1191 | static struct sensor_device_attribute_2 sda_single_files[] = { | 1170 | static struct sensor_device_attribute_2 sda_single_files[] = { |
| 1192 | SENSOR_ATTR_2(chassis, S_IWUSR | S_IRUGO, show_alarm_beep, | ||
| 1193 | store_chassis_clear_legacy, ALARM_STATUS, 30), | ||
| 1194 | SENSOR_ATTR_2(intrusion0_alarm, S_IWUSR | S_IRUGO, show_alarm_beep, | 1171 | SENSOR_ATTR_2(intrusion0_alarm, S_IWUSR | S_IRUGO, show_alarm_beep, |
| 1195 | store_chassis_clear, ALARM_STATUS, 30), | 1172 | store_chassis_clear, ALARM_STATUS, 30), |
| 1196 | SENSOR_ATTR_2(beep_enable, S_IWUSR | S_IRUGO, show_beep_enable, | 1173 | SENSOR_ATTR_2(beep_enable, S_IWUSR | S_IRUGO, show_beep_enable, |
