hwmon: (it87) Fix thermal sensor type values

The it87 driver doesn't follow the standard sensor type values as
documented in Documentation/hwmon/sysfs-interface. It uses value 2 for
thermistors instead of value 4. This causes "sensors" to tell the user
that the chip is setup for a transistor while it is actually setup for
a thermistor.

Using value 4 for thermistors solves the problem. For compatibility
reasons, we still accept value 2 but emit a warning message so that
users update their configuration files.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/Documentation/hwmon/it87 b/Documentation/hwmon/it87
index 3496b7020e7c7207308e1d247a361aee081bd323..042c0415140b1847e06afe4c7c9b426ab04f325f 100644 (file)
--- a/Documentation/hwmon/it87
+++ b/Documentation/hwmon/it87
@@ -136,10 +136,10 @@ once-only alarms.
 The IT87xx only updates its values each 1.5 seconds; reading it more often
 will do no harm, but will return 'old' values.
 
-To change sensor N to a thermistor, 'echo 2 > tempN_type' where N is 1, 2,
+To change sensor N to a thermistor, 'echo 4 > tempN_type' where N is 1, 2,
 or 3. To change sensor N to a thermal diode, 'echo 3 > tempN_type'.
 Give 0 for unused sensor. Any other value is invalid. To configure this at
-startup, consult lm_sensors's /etc/sensors.conf. (2 = thermistor;
+startup, consult lm_sensors's /etc/sensors.conf. (4 = thermistor;
 3 = thermal diode)
 
 

diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
index d793cc0119908abd5494ed9f531a27f3dbbb478b..b74c95735f955f76f178c27510f15640198fbccb 100644 (file)
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
@@ -477,7 +477,7 @@ static ssize_t show_sensor(struct device *dev, struct device_attribute *attr,
        if (reg & (1 << nr))
                return sprintf(buf, "3\n");  /* thermal diode */
        if (reg & (8 << nr))
-               return sprintf(buf, "2\n");  /* thermistor */
+               return sprintf(buf, "4\n");  /* thermistor */
        return sprintf(buf, "0\n");      /* disabled */
 }
 static ssize_t set_sensor(struct device *dev, struct device_attribute *attr,
@@ -493,10 +493,15 @@ static ssize_t set_sensor(struct device *dev, struct device_attribute *attr,
 
        data->sensor &= ~(1 << nr);
        data->sensor &= ~(8 << nr);
-       /* 3 = thermal diode; 2 = thermistor; 0 = disabled */
+       if (val == 2) { /* backwards compatibility */
+               dev_warn(dev, "Sensor type 2 is deprecated, please use 4 "
+                        "instead\n");
+               val = 4;
+       }
+       /* 3 = thermal diode; 4 = thermistor; 0 = disabled */
        if (val == 3)
            data->sensor |= 1 << nr;
-       else if (val == 2)
+       else if (val == 4)
            data->sensor |= 8 << nr;
        else if (val != 0) {
                mutex_unlock(&data->update_lock);