Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 326194
b: refs/heads/master
c: f4a41ee
h: refs/heads/master
v: v3
  • Loading branch information
Guenter Roeck committed Sep 24, 2012
1 parent 7d4bf54 commit 9c85d6f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 27 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 146ab288bbe037aa85a233221cd8d9a84bedcf85
refs/heads/master: f4a41eeac90eaed4e21007e75d21fb74e3588f53
26 changes: 0 additions & 26 deletions trunk/drivers/hwmon/adm9240.c
Original file line number Diff line number Diff line change
Expand Up @@ -500,31 +500,6 @@ static ssize_t set_aout(struct device *dev,
}
static DEVICE_ATTR(aout_output, S_IRUGO | S_IWUSR, show_aout, set_aout);

/* chassis_clear */
static ssize_t chassis_clear_legacy(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t count)
{
struct i2c_client *client = to_i2c_client(dev);
long val;
int err;

err = kstrtol(buf, 10, &val);
if (err)
return err;

dev_warn(dev, "Attribute chassis_clear is deprecated, "
"use intrusion0_alarm instead\n");

if (val == 1) {
i2c_smbus_write_byte_data(client,
ADM9240_REG_CHASSIS_CLEAR, 0x80);
dev_dbg(&client->dev, "chassis intrusion latch cleared\n");
}
return count;
}
static DEVICE_ATTR(chassis_clear, S_IWUSR, NULL, chassis_clear_legacy);

static ssize_t chassis_clear(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t count)
Expand Down Expand Up @@ -586,7 +561,6 @@ static struct attribute *adm9240_attributes[] = {
&sensor_dev_attr_fan2_alarm.dev_attr.attr,
&dev_attr_alarms.attr,
&dev_attr_aout_output.attr,
&dev_attr_chassis_clear.attr,
&sensor_dev_attr_intrusion0_alarm.dev_attr.attr,
&dev_attr_cpu0_vid.attr,
NULL
Expand Down

0 comments on commit 9c85d6f

Please sign in to comment.