13 files changed, 19 insertions, 21 deletions

diff --git a/drivers/hwmon/adt7411.c b/drivers/hwmon/adt7411.c
index 4086c7257f91..f13c843a2964 100644
--- a/drivers/hwmon/adt7411.c
+++ b/drivers/hwmon/adt7411.c
@@ -316,7 +316,6 @@ static int __devinit adt7411_probe(struct i2c_client *client,
  exit_remove:
         sysfs_remove_group(&client->dev.kobj, &adt7411_attr_grp);
  exit_free:
-        i2c_set_clientdata(client, NULL);
         kfree(data);
         return ret;
 }
@@ -327,7 +326,6 @@ static int __devexit adt7411_remove(struct i2c_client *client)
 
         hwmon_device_unregister(data->hwmon_dev);
         sysfs_remove_group(&client->dev.kobj, &adt7411_attr_grp);
-        i2c_set_clientdata(client, NULL);
         kfree(data);
         return 0;
 }
diff --git a/drivers/hwmon/asc7621.c b/drivers/hwmon/asc7621.c
index 0f388adc6187..3b973f30b1f6 100644
--- a/drivers/hwmon/asc7621.c
+++ b/drivers/hwmon/asc7621.c
@@ -1141,7 +1141,6 @@ exit_remove:
                                    &(asc7621_params[i].sda.dev_attr));
         }
 
-        i2c_set_clientdata(client, NULL);
         kfree(data);
         return err;
 }
@@ -1196,7 +1195,6 @@ static int asc7621_remove(struct i2c_client *client)
                                    &(asc7621_params[i].sda.dev_attr));
         }
 
-        i2c_set_clientdata(client, NULL);
         kfree(data);
         return 0;
 }
diff --git a/drivers/hwmon/f75375s.c b/drivers/hwmon/f75375s.c
index bad2cf3ef4a4..0f58ecc5334d 100644
--- a/drivers/hwmon/f75375s.c
+++ b/drivers/hwmon/f75375s.c
@@ -662,7 +662,6 @@ exit_remove:
         sysfs_remove_group(&client->dev.kobj, &f75375_group);
 exit_free:
         kfree(data);
-        i2c_set_clientdata(client, NULL);
         return err;
 }
 
@@ -672,7 +671,6 @@ static int f75375_remove(struct i2c_client *client)
         hwmon_device_unregister(data->hwmon_dev);
         sysfs_remove_group(&client->dev.kobj, &f75375_group);
         kfree(data);
-        i2c_set_clientdata(client, NULL);
         return 0;
 }
 
diff --git a/drivers/hwmon/g760a.c b/drivers/hwmon/g760a.c
index 09ea12e0a551..1f63d1a3af5e 100644
--- a/drivers/hwmon/g760a.c
+++ b/drivers/hwmon/g760a.c
@@ -236,7 +236,6 @@ error_hwmon_device_register:
         sysfs_remove_group(&client->dev.kobj, &g760a_group);
 error_sysfs_create_group:
         kfree(data);
-        i2c_set_clientdata(client, NULL);
 
         return err;
 }
@@ -247,7 +246,6 @@ static int g760a_remove(struct i2c_client *client)
         hwmon_device_unregister(data->hwmon_dev);
         sysfs_remove_group(&client->dev.kobj, &g760a_group);
         kfree(data);
-        i2c_set_clientdata(client, NULL);
 
         return 0;
 }
diff --git a/drivers/hwmon/i5k_amb.c b/drivers/hwmon/i5k_amb.c
index e880e2c3871d..937983407e2a 100644
--- a/drivers/hwmon/i5k_amb.c
+++ b/drivers/hwmon/i5k_amb.c
@@ -289,6 +289,7 @@ static int __devinit i5k_amb_hwmon_init(struct platform_device *pdev)
                         iattr->s_attr.dev_attr.attr.mode = S_IRUGO;
                         iattr->s_attr.dev_attr.show = show_label;
                         iattr->s_attr.index = k;
+                        sysfs_attr_init(&iattr->s_attr.dev_attr.attr);
                         res = device_create_file(&pdev->dev,
                                                  &iattr->s_attr.dev_attr);
                         if (res)
@@ -303,6 +304,7 @@ static int __devinit i5k_amb_hwmon_init(struct platform_device *pdev)
                         iattr->s_attr.dev_attr.attr.mode = S_IRUGO;
                         iattr->s_attr.dev_attr.show = show_amb_temp;
                         iattr->s_attr.index = k;
+                        sysfs_attr_init(&iattr->s_attr.dev_attr.attr);
                         res = device_create_file(&pdev->dev,
                                                  &iattr->s_attr.dev_attr);
                         if (res)
@@ -318,6 +320,7 @@ static int __devinit i5k_amb_hwmon_init(struct platform_device *pdev)
                         iattr->s_attr.dev_attr.show = show_amb_min;
                         iattr->s_attr.dev_attr.store = store_amb_min;
                         iattr->s_attr.index = k;
+                        sysfs_attr_init(&iattr->s_attr.dev_attr.attr);
                         res = device_create_file(&pdev->dev,
                                                  &iattr->s_attr.dev_attr);
                         if (res)
@@ -333,6 +336,7 @@ static int __devinit i5k_amb_hwmon_init(struct platform_device *pdev)
                         iattr->s_attr.dev_attr.show = show_amb_mid;
                         iattr->s_attr.dev_attr.store = store_amb_mid;
                         iattr->s_attr.index = k;
+                        sysfs_attr_init(&iattr->s_attr.dev_attr.attr);
                         res = device_create_file(&pdev->dev,
                                                  &iattr->s_attr.dev_attr);
                         if (res)
@@ -348,6 +352,7 @@ static int __devinit i5k_amb_hwmon_init(struct platform_device *pdev)
                         iattr->s_attr.dev_attr.show = show_amb_max;
                         iattr->s_attr.dev_attr.store = store_amb_max;
                         iattr->s_attr.index = k;
+                        sysfs_attr_init(&iattr->s_attr.dev_attr.attr);
                         res = device_create_file(&pdev->dev,
                                                  &iattr->s_attr.dev_attr);
                         if (res)
@@ -362,6 +367,7 @@ static int __devinit i5k_amb_hwmon_init(struct platform_device *pdev)
                         iattr->s_attr.dev_attr.attr.mode = S_IRUGO;
                         iattr->s_attr.dev_attr.show = show_amb_alarm;
                         iattr->s_attr.index = k;
+                        sysfs_attr_init(&iattr->s_attr.dev_attr.attr);
                         res = device_create_file(&pdev->dev,
                                                  &iattr->s_attr.dev_attr);
                         if (res)
diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c
index 099a2138cdf6..da5a2404cd3e 100644
--- a/drivers/hwmon/k10temp.c
+++ b/drivers/hwmon/k10temp.c
@@ -112,11 +112,21 @@ static bool __devinit has_erratum_319(struct pci_dev *pdev)
         if (pkg_type != CPUID_PKGTYPE_AM2R2_AM3)
                 return false;
 
-        /* Differentiate between AM2+ (bad) and AM3 (good) */
+        /* DDR3 memory implies socket AM3, which is good */
         pci_bus_read_config_dword(pdev->bus,
                                   PCI_DEVFN(PCI_SLOT(pdev->devfn), 2),
                                   REG_DCT0_CONFIG_HIGH, &reg_dram_cfg);
-        return !(reg_dram_cfg & DDR3_MODE);
+        if (reg_dram_cfg & DDR3_MODE)
+                return false;
+
+        /*
+         * Unfortunately it is possible to run a socket AM3 CPU with DDR2
+         * memory. We blacklist all the cores which do exist in socket AM2+
+         * format. It still isn't perfect, as RB-C2 cores exist in both AM2+
+         * and AM3 formats, but that's the best we can do.
+         */
+        return boot_cpu_data.x86_model < 4 ||
+               (boot_cpu_data.x86_model == 4 && boot_cpu_data.x86_mask <= 2);
 }
 
 static int __devinit k10temp_probe(struct pci_dev *pdev,
diff --git a/drivers/hwmon/k8temp.c b/drivers/hwmon/k8temp.c
index 0ceb6d6200a3..f26acdb11681 100644
--- a/drivers/hwmon/k8temp.c
+++ b/drivers/hwmon/k8temp.c
@@ -120,7 +120,7 @@ static ssize_t show_temp(struct device *dev,
         int temp;
         struct k8temp_data *data = k8temp_update_device(dev);
 
-        if (data->swap_core_select)
+        if (data->swap_core_select && (data->sensorsp & SEL_CORE))
                 core = core ? 0 : 1;
 
         temp = TEMP_FROM_REG(data->temp[core][place]) + data->temp_offset;
diff --git a/drivers/hwmon/lm73.c b/drivers/hwmon/lm73.c
index 4d1b76bc8148..29b9030d42c3 100644
--- a/drivers/hwmon/lm73.c
+++ b/drivers/hwmon/lm73.c
@@ -136,7 +136,6 @@ static int lm73_remove(struct i2c_client *client)
 
         hwmon_device_unregister(hwmon_dev);
         sysfs_remove_group(&client->dev.kobj, &lm73_group);
-        i2c_set_clientdata(client, NULL);
         return 0;
 }
 
diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c
index 56463428a419..393f354f92a4 100644
--- a/drivers/hwmon/lm75.c
+++ b/drivers/hwmon/lm75.c
@@ -192,7 +192,6 @@ lm75_probe(struct i2c_client *client, const struct i2c_device_id *id)
 exit_remove:
         sysfs_remove_group(&client->dev.kobj, &lm75_group);
 exit_free:
-        i2c_set_clientdata(client, NULL);
         kfree(data);
         return status;
 }
@@ -204,7 +203,6 @@ static int lm75_remove(struct i2c_client *client)
         hwmon_device_unregister(data->hwmon_dev);
         sysfs_remove_group(&client->dev.kobj, &lm75_group);
         lm75_write_value(client, LM75_REG_CONF, data->orig_conf);
-        i2c_set_clientdata(client, NULL);
         kfree(data);
         return 0;
 }
diff --git a/drivers/hwmon/lm95241.c b/drivers/hwmon/lm95241.c
index 8fc8eb8cba47..94741d42112d 100644
--- a/drivers/hwmon/lm95241.c
+++ b/drivers/hwmon/lm95241.c
@@ -399,7 +399,6 @@ static int lm95241_remove(struct i2c_client *client)
         hwmon_device_unregister(data->hwmon_dev);
         sysfs_remove_group(&client->dev.kobj, &lm95241_group);
 
-        i2c_set_clientdata(client, NULL);
         kfree(data);
         return 0;
 }
diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c
index 8013895a1faf..93187c3cb5e7 100644
--- a/drivers/hwmon/tmp102.c
+++ b/drivers/hwmon/tmp102.c
@@ -224,7 +224,6 @@ fail_remove_sysfs:
 fail_restore_config:
         tmp102_write_reg(client, TMP102_CONF_REG, tmp102->config_orig);
 fail_free:
-        i2c_set_clientdata(client, NULL);
         kfree(tmp102);
 
         return status;
@@ -247,7 +246,6 @@ static int __devexit tmp102_remove(struct i2c_client *client)
                                          config | TMP102_CONF_SD);
         }
 
-        i2c_set_clientdata(client, NULL);
         kfree(tmp102);
 
         return 0;
diff --git a/drivers/hwmon/tmp421.c b/drivers/hwmon/tmp421.c
index 738c472ece27..6b4165c12092 100644
--- a/drivers/hwmon/tmp421.c
+++ b/drivers/hwmon/tmp421.c
@@ -295,7 +295,6 @@ exit_remove:
         sysfs_remove_group(&client->dev.kobj, &tmp421_group);
 
 exit_free:
-        i2c_set_clientdata(client, NULL);
         kfree(data);
 
         return err;
@@ -308,7 +307,6 @@ static int tmp421_remove(struct i2c_client *client)
         hwmon_device_unregister(data->hwmon_dev);
         sysfs_remove_group(&client->dev.kobj, &tmp421_group);
 
-        i2c_set_clientdata(client, NULL);
         kfree(data);
 
         return 0;
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c
index 32d4adee73db..c84b9b4e6960 100644
--- a/drivers/hwmon/w83781d.c
+++ b/drivers/hwmon/w83781d.c
@@ -1197,7 +1197,6 @@ ERROR4:
         if (data->lm75[1])
                 i2c_unregister_device(data->lm75[1]);
 ERROR3:
-        i2c_set_clientdata(client, NULL);
         kfree(data);
 ERROR1:
         return err;
@@ -1219,7 +1218,6 @@ w83781d_remove(struct i2c_client *client)
         if (data->lm75[1])
                 i2c_unregister_device(data->lm75[1]);
 
-        i2c_set_clientdata(client, NULL);
         kfree(data);
 
         return 0;