Hi Jean,
On Tue, 2010-11-02 at 12:41 -0400, Jean Delvare wrote:
> We have a standard intrusion detection interface now, drivers should
> implement it. I've left the old interface in place for the time being,
> with a deprecation warning, it will be removed later.
>
> Signed-off-by: Jean Delvare <khali@xxxxxxxxxxxx>
> ---
> Documentation/hwmon/w83793 | 2 +-
> drivers/hwmon/w83793.c | 32 +++++++++++++++++++++++++++++---
> 2 files changed, 30 insertions(+), 4 deletions(-)
>
> --- linux-2.6.37-rc1.orig/Documentation/hwmon/w83793 2010-11-02 16:55:58.000000000 +0100
> +++ linux-2.6.37-rc1/Documentation/hwmon/w83793 2010-11-02 17:15:32.000000000 +0100
> @@ -92,7 +92,7 @@ This driver implements support for Winbo
>
> * Chassis
> If the case open alarm triggers, it will stay in this state unless cleared
> - by any write to the sysfs file "chassis".
> + by writing 0 to the sysfs file "intrusion0_alarm".
>
> * VID and VRM
> The VRM version is detected automatically, don't modify the it unless you
> --- linux-2.6.37-rc1.orig/drivers/hwmon/w83793.c 2010-11-02 16:55:58.000000000 +0100
> +++ linux-2.6.37-rc1/drivers/hwmon/w83793.c 2010-11-02 17:16:45.000000000 +0100
> @@ -421,14 +421,16 @@ store_beep_enable(struct device *dev, st
>
> /* Write any value to clear chassis alarm */
> static ssize_t
> -store_chassis_clear(struct device *dev,
> - struct device_attribute *attr, const char *buf,
> - size_t count)
> +store_chassis_clear_legacy(struct device *dev,
> + struct device_attribute *attr, const char *buf,
> + size_t count)
> {
> struct i2c_client *client = to_i2c_client(dev);
> struct w83793_data *data = i2c_get_clientdata(client);
> u8 val;
>
> + dev_warn(&client->dev, "Attribute chassis is deprecated, "
> + "use intrusion0_alarm instead\n");
> mutex_lock(&data->update_lock);
> val = w83793_read_value(client, W83793_REG_CLR_CHASSIS);
> val |= 0x80;
> @@ -437,6 +439,28 @@ store_chassis_clear(struct device *dev,
> return count;
> }
>
> +/* Write 0 to clear chassis alarm */
> +static ssize_t
> +store_chassis_clear(struct device *dev,
> + struct device_attribute *attr, const char *buf,
> + size_t count)
> +{
> + struct i2c_client *client = to_i2c_client(dev);
> + struct w83793_data *data = i2c_get_clientdata(client);
> + unsigned long val;
> + u8 reg;
> +
> + if (strict_strtoul(buf, 10, &val) || val != 0)
> + return -EINVAL;
> +
> + mutex_lock(&data->update_lock);
> + reg = w83793_read_value(client, W83793_REG_CLR_CHASSIS);
> + w83793_write_value(client, W83793_REG_CLR_CHASSIS, reg | 0x80);
> + data->alarms[3] &= ~(1 << 6);
Same as with the other patch - you don't really know if the alarm was
cleared.
Thanks,
Guenter
_______________________________________________
lm-sensors mailing list
lm-sensors@xxxxxxxxxxxxxx
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
