Re: [PATCH v2 5/7] hwmon: (lm90) Introduce 3rd set of uppertemperature limits

From: Jean Delvare
Date: Tue Sep 14 2010 - 06:52:05 EST


Hi Guenter,

On Thu, 9 Sep 2010 06:25:48 -0700, Guenter Roeck wrote:
> Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
> ---
> drivers/hwmon/lm90.c | 34 ++++++++++++++++++++++++++++++++--
> 1 files changed, 32 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
> index 11b5701..d2bcb47 100644
> --- a/drivers/hwmon/lm90.c
> +++ b/drivers/hwmon/lm90.c
> @@ -147,6 +147,7 @@ enum chips { lm90, adm1032, lm99, lm86, max6657, adt7461, max6680, max6646,
> #define LM90_HAVE_OFFSET 0x02 /* temperature offset register */
> #define LM90_HAVE_LOCAL_EXT 0x04 /* extended local temperature */
> #define LM90_HAVE_REM_LIMIT_EXT 0x08 /* extended remote limit */
> +#define LM90_HAVE_EMERGENCY 0x10 /* 3rd upper (emergency) limit */
>
> /*
> * Functions declaration
> @@ -213,10 +214,12 @@ struct lm90_data {
> u8 alert_alarms; /* Which alarm bits trigger ALERT# */
>
> /* registers values */
> - s8 temp8[4]; /* 0: local low limit
> + s8 temp8[6]; /* 0: local low limit
> 1: local high limit
> 2: local critical limit
> - 3: remote critical limit */
> + 3: remote critical limit
> + 4: local emergency limit
> + 5: remote emergency limit */
> s16 temp11[5]; /* 0: remote input
> 1: remote low limit
> 2: remote high limit
> @@ -608,6 +611,24 @@ static const struct attribute_group lm90_group = {
> .attrs = lm90_attributes,
> };
>
> +/*
> + * Additional attributes for devices with emergency sensors
> + */
> +static SENSOR_DEVICE_ATTR(temp1_emergency, S_IWUSR | S_IRUGO, show_temp8,
> + set_temp8, 4);
> +static SENSOR_DEVICE_ATTR(temp2_emergency, S_IWUSR | S_IRUGO, show_temp8,
> + set_temp8, 5);
> +
> +static struct attribute *lm90_emergency_attributes[] = {
> + &sensor_dev_attr_temp1_emergency.dev_attr.attr,
> + &sensor_dev_attr_temp2_emergency.dev_attr.attr,
> + NULL
> +};
> +
> +static const struct attribute_group lm90_emergency_group = {
> + .attrs = lm90_emergency_attributes,
> +};
> +
> /* pec used for ADM1032 only */
> static ssize_t show_pec(struct device *dev, struct device_attribute *dummy,
> char *buf)
> @@ -818,6 +839,9 @@ static int lm90_detect(struct i2c_client *new_client,
>
> static void lm90_remove_files(struct i2c_client *client, struct lm90_data *data)
> {
> + if (data->flags & LM90_HAVE_EMERGENCY)
> + sysfs_remove_group(&client->dev.kobj,
> + &lm90_emergency_group);
> if (data->flags & LM90_HAVE_OFFSET)
> device_remove_file(&client->dev,
> &sensor_dev_attr_temp2_offset.dev_attr);

But this flag is never set?

> @@ -889,6 +913,12 @@ static int lm90_probe(struct i2c_client *new_client,
> if (err)
> goto exit_remove_files;
> }
> + if (data->flags & LM90_HAVE_EMERGENCY) {
> + err = sysfs_create_group(&new_client->dev.kobj,
> + &lm90_emergency_group);
> + if (err)
> + goto exit_remove_files;
> + }
>
> data->hwmon_dev = hwmon_device_register(&new_client->dev);
> if (IS_ERR(data->hwmon_dev)) {

--
Jean Delvare
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/