]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
hwmon: (adm1021) Do not create min sysfs attributes for LM84
authorGuenter Roeck <linux@roeck-us.net>
Thu, 6 Jun 2013 17:30:10 +0000 (10:30 -0700)
committerGuenter Roeck <linux@roeck-us.net>
Sun, 16 Jun 2013 14:53:01 +0000 (07:53 -0700)
LM84 does not support minimum temperature registers.
Only create the respective sysfs attributes for other chips.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Jean Delvare <khali@linux-fr.org>
drivers/hwmon/adm1021.c

index f920619cd6da5405ca5cd9c64e9f1ad31fb8a526..29dd9f746dfa23efea7206277a60f950a2d6eddf 100644 (file)
@@ -284,15 +284,11 @@ static DEVICE_ATTR(low_power, S_IWUSR | S_IRUGO, show_low_power, set_low_power);
 
 static struct attribute *adm1021_attributes[] = {
        &sensor_dev_attr_temp1_max.dev_attr.attr,
-       &sensor_dev_attr_temp1_min.dev_attr.attr,
        &sensor_dev_attr_temp1_input.dev_attr.attr,
        &sensor_dev_attr_temp2_max.dev_attr.attr,
-       &sensor_dev_attr_temp2_min.dev_attr.attr,
        &sensor_dev_attr_temp2_input.dev_attr.attr,
        &sensor_dev_attr_temp1_max_alarm.dev_attr.attr,
-       &sensor_dev_attr_temp1_min_alarm.dev_attr.attr,
        &sensor_dev_attr_temp2_max_alarm.dev_attr.attr,
-       &sensor_dev_attr_temp2_min_alarm.dev_attr.attr,
        &sensor_dev_attr_temp2_fault.dev_attr.attr,
        &dev_attr_alarms.attr,
        &dev_attr_low_power.attr,
@@ -303,6 +299,18 @@ static const struct attribute_group adm1021_group = {
        .attrs = adm1021_attributes,
 };
 
+static struct attribute *adm1021_min_attributes[] = {
+       &sensor_dev_attr_temp1_min.dev_attr.attr,
+       &sensor_dev_attr_temp2_min.dev_attr.attr,
+       &sensor_dev_attr_temp1_min_alarm.dev_attr.attr,
+       &sensor_dev_attr_temp2_min_alarm.dev_attr.attr,
+       NULL
+};
+
+static const struct attribute_group adm1021_min_group = {
+       .attrs = adm1021_min_attributes,
+};
+
 /* Return 0 if detection is successful, -ENODEV otherwise */
 static int adm1021_detect(struct i2c_client *client,
                          struct i2c_board_info *info)
@@ -425,6 +433,12 @@ static int adm1021_probe(struct i2c_client *client,
        if (err)
                return err;
 
+       if (data->type != lm84) {
+               err = sysfs_create_group(&client->dev.kobj, &adm1021_min_group);
+               if (err)
+                       goto error;
+       }
+
        data->hwmon_dev = hwmon_device_register(&client->dev);
        if (IS_ERR(data->hwmon_dev)) {
                err = PTR_ERR(data->hwmon_dev);
@@ -434,6 +448,7 @@ static int adm1021_probe(struct i2c_client *client,
        return 0;
 
 error:
+       sysfs_remove_group(&client->dev.kobj, &adm1021_min_group);
        sysfs_remove_group(&client->dev.kobj, &adm1021_group);
        return err;
 }
@@ -452,6 +467,7 @@ static int adm1021_remove(struct i2c_client *client)
        struct adm1021_data *data = i2c_get_clientdata(client);
 
        hwmon_device_unregister(data->hwmon_dev);
+       sysfs_remove_group(&client->dev.kobj, &adm1021_min_group);
        sysfs_remove_group(&client->dev.kobj, &adm1021_group);
 
        return 0;
@@ -477,9 +493,11 @@ static struct adm1021_data *adm1021_update_device(struct device *dev)
                        data->temp_max[i] = 1000 *
                                (s8) i2c_smbus_read_byte_data(
                                        client, ADM1021_REG_TOS_R(i));
-                       data->temp_min[i] = 1000 *
-                               (s8) i2c_smbus_read_byte_data(
-                                       client, ADM1021_REG_THYST_R(i));
+                       if (data->type != lm84) {
+                               data->temp_min[i] = 1000 *
+                                 (s8) i2c_smbus_read_byte_data(client,
+                                                       ADM1021_REG_THYST_R(i));
+                       }
                }
                data->alarms = i2c_smbus_read_byte_data(client,
                                                ADM1021_REG_STATUS) & 0x7c;