5 files changed, 62 insertions, 101 deletions

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 0fba82943125..4d4d09bdec0a 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -332,11 +332,11 @@ config SENSORS_F71805F
           will be called f71805f.
 
 config SENSORS_F71882FG
-        tristate "Fintek F71808E, F71858FG, F71862FG, F71882FG, F71889FG and F8000"
+        tristate "Fintek F71858FG, F71862FG, F71882FG, F71889FG and F8000"
         depends on EXPERIMENTAL
         help
-          If you say yes here you get support for hardware monitoring features
-          of the Fintek F71808E, F71858FG, F71862FG/71863FG, F71882FG/F71883FG,
+          If you say yes here you get support for hardware monitoring
+          features of the Fintek F71858FG, F71862FG/71863FG, F71882FG/F71883FG,
           F71889FG and F8000 Super-I/O chips.
 
           This driver can also be built as a module.  If so, the module
diff --git a/drivers/hwmon/ads7871.c b/drivers/hwmon/ads7871.c
index b300a2048af1..52319340e182 100644
--- a/drivers/hwmon/ads7871.c
+++ b/drivers/hwmon/ads7871.c
@@ -160,30 +160,12 @@ static const struct attribute_group ads7871_group = {
 
 static int __devinit ads7871_probe(struct spi_device *spi)
 {
-        int status, ret, err = 0;
+        int ret, err;
         uint8_t val;
         struct ads7871_data *pdata;
 
         dev_dbg(&spi->dev, "probe\n");
 
-        pdata = kzalloc(sizeof(struct ads7871_data), GFP_KERNEL);
-        if (!pdata) {
-                err = -ENOMEM;
-                goto exit;
-        }
-
-        status = sysfs_create_group(&spi->dev.kobj, &ads7871_group);
-        if (status < 0)
-                goto error_free;
-
-        pdata->hwmon_dev = hwmon_device_register(&spi->dev);
-        if (IS_ERR(pdata->hwmon_dev)) {
-                err = PTR_ERR(pdata->hwmon_dev);
-                goto error_remove;
-        }
-
-        spi_set_drvdata(spi, pdata);
-
         /* Configure the SPI bus */
         spi->mode = (SPI_MODE_0);
         spi->bits_per_word = 8;
@@ -201,6 +183,24 @@ static int __devinit ads7871_probe(struct spi_device *spi)
         we need to make sure we really have a chip*/
         if (val != ret) {
                 err = -ENODEV;
+                goto exit;
+        }
+
+        pdata = kzalloc(sizeof(struct ads7871_data), GFP_KERNEL);
+        if (!pdata) {
+                err = -ENOMEM;
+                goto exit;
+        }
+
+        err = sysfs_create_group(&spi->dev.kobj, &ads7871_group);
+        if (err < 0)
+                goto error_free;
+
+        spi_set_drvdata(spi, pdata);
+
+        pdata->hwmon_dev = hwmon_device_register(&spi->dev);
+        if (IS_ERR(pdata->hwmon_dev)) {
+                err = PTR_ERR(pdata->hwmon_dev);
                 goto error_remove;
         }
 
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index c070c9714cbe..de8111114f46 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -518,7 +518,6 @@ static struct notifier_block coretemp_cpu_notifier __refdata = {
 static int __init coretemp_init(void)
 {
         int i, err = -ENODEV;
-        struct pdev_entry *p, *n;
 
         /* quick check if we run Intel */
         if (cpu_data(0).x86_vendor != X86_VENDOR_INTEL)
diff --git a/drivers/hwmon/f71882fg.c b/drivers/hwmon/f71882fg.c
index 6207120dcd4d..537841ef44b9 100644
--- a/drivers/hwmon/f71882fg.c
+++ b/drivers/hwmon/f71882fg.c
@@ -45,7 +45,6 @@
 #define SIO_REG_ADDR            0x60    /* Logical device address (2 bytes) */
 
 #define SIO_FINTEK_ID           0x1934  /* Manufacturers ID */
-#define SIO_F71808_ID           0x0901  /* Chipset ID */
 #define SIO_F71858_ID           0x0507  /* Chipset ID */
 #define SIO_F71862_ID           0x0601  /* Chipset ID */
 #define SIO_F71882_ID           0x0541  /* Chipset ID */
@@ -97,10 +96,9 @@ static unsigned short force_id;
 module_param(force_id, ushort, 0);
 MODULE_PARM_DESC(force_id, "Override the detected device ID");
 
-enum chips { f71808fg, f71858fg, f71862fg, f71882fg, f71889fg, f8000 };
+enum chips { f71858fg, f71862fg, f71882fg, f71889fg, f8000 };
 
 static const char *f71882fg_names[] = {
-        "f71808fg",
         "f71858fg",
         "f71862fg",
         "f71882fg",
@@ -308,8 +306,8 @@ static struct sensor_device_attribute_2 f71858fg_in_temp_attr[] = {
         SENSOR_ATTR_2(temp3_fault, S_IRUGO, show_temp_fault, NULL, 0, 2),
 };
 
-/* In attr common to the f71862fg, f71882fg and f71889fg */
-static struct sensor_device_attribute_2 fxxxx_in_attr[] = {
+/* Temp and in attr common to the f71862fg, f71882fg and f71889fg */
+static struct sensor_device_attribute_2 fxxxx_in_temp_attr[] = {
         SENSOR_ATTR_2(in0_input, S_IRUGO, show_in, NULL, 0, 0),
         SENSOR_ATTR_2(in1_input, S_IRUGO, show_in, NULL, 0, 1),
         SENSOR_ATTR_2(in2_input, S_IRUGO, show_in, NULL, 0, 2),
@@ -319,22 +317,6 @@ static struct sensor_device_attribute_2 fxxxx_in_attr[] = {
         SENSOR_ATTR_2(in6_input, S_IRUGO, show_in, NULL, 0, 6),
         SENSOR_ATTR_2(in7_input, S_IRUGO, show_in, NULL, 0, 7),
         SENSOR_ATTR_2(in8_input, S_IRUGO, show_in, NULL, 0, 8),
-};
-
-/* In attr for the f71808fg */
-static struct sensor_device_attribute_2 f71808_in_attr[] = {
-        SENSOR_ATTR_2(in0_input, S_IRUGO, show_in, NULL, 0, 0),
-        SENSOR_ATTR_2(in1_input, S_IRUGO, show_in, NULL, 0, 1),
-        SENSOR_ATTR_2(in2_input, S_IRUGO, show_in, NULL, 0, 2),
-        SENSOR_ATTR_2(in3_input, S_IRUGO, show_in, NULL, 0, 3),
-        SENSOR_ATTR_2(in4_input, S_IRUGO, show_in, NULL, 0, 4),
-        SENSOR_ATTR_2(in5_input, S_IRUGO, show_in, NULL, 0, 5),
-        SENSOR_ATTR_2(in6_input, S_IRUGO, show_in, NULL, 0, 7),
-        SENSOR_ATTR_2(in7_input, S_IRUGO, show_in, NULL, 0, 8),
-};
-
-/* Temp attr common to the f71808fg, f71862fg, f71882fg and f71889fg */
-static struct sensor_device_attribute_2 fxxxx_temp_attr[] = {
         SENSOR_ATTR_2(temp1_input, S_IRUGO, show_temp, NULL, 0, 1),
         SENSOR_ATTR_2(temp1_max, S_IRUGO|S_IWUSR, show_temp_max,
                 store_temp_max, 0, 1),
@@ -373,10 +355,6 @@ static struct sensor_device_attribute_2 fxxxx_temp_attr[] = {
                 store_temp_beep, 0, 6),
         SENSOR_ATTR_2(temp2_type, S_IRUGO, show_temp_type, NULL, 0, 2),
         SENSOR_ATTR_2(temp2_fault, S_IRUGO, show_temp_fault, NULL, 0, 2),
-};
-
-/* Temp and in attr common to the f71862fg, f71882fg and f71889fg */
-static struct sensor_device_attribute_2 f71862_temp_attr[] = {
         SENSOR_ATTR_2(temp3_input, S_IRUGO, show_temp, NULL, 0, 3),
         SENSOR_ATTR_2(temp3_max, S_IRUGO|S_IWUSR, show_temp_max,
                 store_temp_max, 0, 3),
@@ -1011,11 +989,6 @@ static struct f71882fg_data *f71882fg_update_device(struct device *dev)
                                 data->temp_type[1] = 6;
                                 break;
                         }
-                } else if (data->type == f71808fg) {
-                        reg  = f71882fg_read8(data, F71882FG_REG_TEMP_TYPE);
-                        data->temp_type[1] = (reg & 0x02) ? 2 : 4;
-                        data->temp_type[2] = (reg & 0x04) ? 2 : 4;
-
                 } else {
                         reg2 = f71882fg_read8(data, F71882FG_REG_PECI);
                         if ((reg2 & 0x03) == 0x01)
@@ -1898,8 +1871,7 @@ static ssize_t store_pwm_auto_point_temp(struct device *dev,
 
         val /= 1000;
 
-        if (data->type == f71889fg
-         || data->type == f71808fg)
+        if (data->type == f71889fg)
                 val = SENSORS_LIMIT(val, -128, 127);
         else
                 val = SENSORS_LIMIT(val, 0, 127);
@@ -2002,28 +1974,8 @@ static int __devinit f71882fg_probe(struct platform_device *pdev)
                         /* fall through! */
                 case f71862fg:
                         err = f71882fg_create_sysfs_files(pdev,
-                                        f71862_temp_attr,
-                                        ARRAY_SIZE(f71862_temp_attr));
-                        if (err)
-                                goto exit_unregister_sysfs;
-                        err = f71882fg_create_sysfs_files(pdev,
-                                        fxxxx_in_attr,
-                                        ARRAY_SIZE(fxxxx_in_attr));
-                        if (err)
-                                goto exit_unregister_sysfs;
-                        err = f71882fg_create_sysfs_files(pdev,
-                                        fxxxx_temp_attr,
-                                        ARRAY_SIZE(fxxxx_temp_attr));
-                        break;
-                case f71808fg:
-                        err = f71882fg_create_sysfs_files(pdev,
-                                        f71808_in_attr,
-                                        ARRAY_SIZE(f71808_in_attr));
-                        if (err)
-                                goto exit_unregister_sysfs;
-                        err = f71882fg_create_sysfs_files(pdev,
-                                        fxxxx_temp_attr,
-                                        ARRAY_SIZE(fxxxx_temp_attr));
+                                        fxxxx_in_temp_attr,
+                                        ARRAY_SIZE(fxxxx_in_temp_attr));
                         break;
                 case f8000:
                         err = f71882fg_create_sysfs_files(pdev,
@@ -2050,7 +2002,6 @@ static int __devinit f71882fg_probe(struct platform_device *pdev)
                 case f71862fg:
                         err = (data->pwm_enable & 0x15) != 0x15;
                         break;
-                case f71808fg:
                 case f71882fg:
                 case f71889fg:
                         err = 0;
@@ -2096,7 +2047,6 @@ static int __devinit f71882fg_probe(struct platform_device *pdev)
                                         f8000_auto_pwm_attr,
                                         ARRAY_SIZE(f8000_auto_pwm_attr));
                         break;
-                case f71808fg:
                 case f71889fg:
                         for (i = 0; i < nr_fans; i++) {
                                 data->pwm_auto_point_mapping[i] =
@@ -2176,22 +2126,8 @@ static int f71882fg_remove(struct platform_device *pdev)
                         /* fall through! */
                 case f71862fg:
                         f71882fg_remove_sysfs_files(pdev,
-                                        f71862_temp_attr,
-                                        ARRAY_SIZE(f71862_temp_attr));
-                        f71882fg_remove_sysfs_files(pdev,
-                                        fxxxx_in_attr,
-                                        ARRAY_SIZE(fxxxx_in_attr));
-                        f71882fg_remove_sysfs_files(pdev,
-                                        fxxxx_temp_attr,
-                                        ARRAY_SIZE(fxxxx_temp_attr));
-                        break;
-                case f71808fg:
-                        f71882fg_remove_sysfs_files(pdev,
-                                        f71808_in_attr,
-                                        ARRAY_SIZE(f71808_in_attr));
-                        f71882fg_remove_sysfs_files(pdev,
-                                        fxxxx_temp_attr,
-                                        ARRAY_SIZE(fxxxx_temp_attr));
+                                        fxxxx_in_temp_attr,
+                                        ARRAY_SIZE(fxxxx_in_temp_attr));
                         break;
                 case f8000:
                         f71882fg_remove_sysfs_files(pdev,
@@ -2259,9 +2195,6 @@ static int __init f71882fg_find(int sioaddr, unsigned short *address,
 
         devid = force_id ? force_id : superio_inw(sioaddr, SIO_REG_DEVID);
         switch (devid) {
-        case SIO_F71808_ID:
-                sio_data->type = f71808fg;
-                break;
         case SIO_F71858_ID:
                 sio_data->type = f71858fg;
                 break;
diff --git a/drivers/hwmon/k8temp.c b/drivers/hwmon/k8temp.c
index b9bb3e0ca530..39ead2a4d3c5 100644
--- a/drivers/hwmon/k8temp.c
+++ b/drivers/hwmon/k8temp.c
@@ -143,6 +143,37 @@ static const struct pci_device_id k8temp_ids[] = {
 
 MODULE_DEVICE_TABLE(pci, k8temp_ids);
 
+static int __devinit is_rev_g_desktop(u8 model)
+{
+        u32 brandidx;
+
+        if (model < 0x69)
+                return 0;
+
+        if (model == 0xc1 || model == 0x6c || model == 0x7c)
+                return 0;
+
+        /*
+         * Differentiate between AM2 and ASB1.
+         * See "Constructing the processor Name String" in "Revision
+         * Guide for AMD NPT Family 0Fh Processors" (33610).
+         */
+        brandidx = cpuid_ebx(0x80000001);
+        brandidx = (brandidx >> 9) & 0x1f;
+
+        /* Single core */
+        if ((model == 0x6f || model == 0x7f) &&
+            (brandidx == 0x7 || brandidx == 0x9 || brandidx == 0xc))
+                return 0;
+
+        /* Dual core */
+        if (model == 0x6b &&
+            (brandidx == 0xb || brandidx == 0xc))
+                return 0;
+
+        return 1;
+}
+
 static int __devinit k8temp_probe(struct pci_dev *pdev,
                                   const struct pci_device_id *id)
 {
@@ -179,9 +210,7 @@ static int __devinit k8temp_probe(struct pci_dev *pdev,
                                  "wrong - check erratum #141\n");
                 }
 
-                if ((model >= 0x69) &&
-                    !(model == 0xc1 || model == 0x6c || model == 0x7c ||
-                      model == 0x6b || model == 0x6f || model == 0x7f)) {
+                if (is_rev_g_desktop(model)) {
                         /*
                          * RevG desktop CPUs (i.e. no socket S1G1 or
                          * ASB1 parts) need additional offset,