hwmon: Don't export thermistor beta

Deprecate the use of thermistor beta values as thermal sensor types.
No driver supports changing the beta value anyway.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Hans de Goede <j.w.r.degoede@hhs.nl>
Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>

1 files changed, 9 insertions, 7 deletions

diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c
index 8ed88f3d5767..c12bdf9d9e1d 100644
--- a/drivers/hwmon/w83781d.c
+++ b/drivers/hwmon/w83781d.c
@@ -251,9 +251,7 @@ struct w83781d_data {
         u8 pwm2_enable;         /* Boolean */
         u16 sens[3];            /* 782D/783S only.
                                    1 = pentium diode; 2 = 3904 diode;
-                                   3000-5000 = thermistor beta.
-                                   Default = 3435. 
-                                   Other Betas unimplemented */
+                                   4 = thermistor */
         u8 vrm;
 };
 
@@ -721,15 +719,19 @@ store_sensor(struct device *dev, struct device_attribute *da,
                                     tmp & ~BIT_SCFG2[nr]);
                 data->sens[nr] = val;
                 break;
-        case W83781D_DEFAULT_BETA:      /* thermistor */
+        case W83781D_DEFAULT_BETA:
+                dev_warn(dev, "Sensor type %d is deprecated, please use 4 "
+                         "instead\n", W83781D_DEFAULT_BETA);
+                /* fall through */
+        case 4:         /* thermistor */
                 tmp = w83781d_read_value(data, W83781D_REG_SCFG1);
                 w83781d_write_value(data, W83781D_REG_SCFG1,
                                     tmp & ~BIT_SCFG1[nr]);
                 data->sens[nr] = val;
                 break;
         default:
-                dev_err(dev, "Invalid sensor type %ld; must be 1, 2, or %d\n",
-                       (long) val, W83781D_DEFAULT_BETA);
+                dev_err(dev, "Invalid sensor type %ld; must be 1, 2, or 4\n",
+                       (long) val);
                 break;
         }
 
@@ -1485,7 +1487,7 @@ w83781d_init_device(struct device *dev)
                 tmp = w83781d_read_value(data, W83781D_REG_SCFG1);
                 for (i = 1; i <= 3; i++) {
                         if (!(tmp & BIT_SCFG1[i - 1])) {
-                                data->sens[i - 1] = W83781D_DEFAULT_BETA;
+                                data->sens[i - 1] = 4;
                         } else {
                                 if (w83781d_read_value
                                     (data,