Patched in Tegra support.

1 files changed, 41 insertions, 19 deletions

diff --git a/drivers/hwmon/k8temp.c b/drivers/hwmon/k8temp.c
index 9f3c0aeacdb..b923bc2307a 100644
--- a/drivers/hwmon/k8temp.c
+++ b/drivers/hwmon/k8temp.c
@@ -22,6 +22,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/jiffies.h>
@@ -45,7 +46,7 @@ struct k8temp_data {
         unsigned long last_updated;     /* in jiffies */
 
         /* registers values */
-        u8 sensorsp;            /* sensor presence bits - SEL_CORE, SEL_PLACE */
+        u8 sensorsp;            /* sensor presence bits - SEL_CORE & SEL_PLACE */
         u32 temp[2][2];         /* core, place */
         u8 swap_core_select;    /* meaning of SEL_CORE is inverted */
         u32 temp_offset;
@@ -62,7 +63,7 @@ static struct k8temp_data *k8temp_update_device(struct device *dev)
         if (!data->valid
             || time_after(jiffies, data->last_updated + HZ)) {
                 pci_read_config_byte(pdev, REG_TEMP, &tmp);
-                tmp &= ~(SEL_PLACE | SEL_CORE); /* Select sensor 0, core0 */
+                tmp &= ~(SEL_PLACE | SEL_CORE);         /* Select sensor 0, core0 */
                 pci_write_config_byte(pdev, REG_TEMP, tmp);
                 pci_read_config_dword(pdev, REG_TEMP, &data->temp[0][0]);
 
@@ -81,7 +82,7 @@ static struct k8temp_data *k8temp_update_device(struct device *dev)
                                               &data->temp[1][0]);
 
                         if (data->sensorsp & SEL_PLACE) {
-                                tmp |= SEL_PLACE; /* Select sensor 1, core1 */
+                                tmp |= SEL_PLACE;       /* Select sensor 1, core1 */
                                 pci_write_config_byte(pdev, REG_TEMP, tmp);
                                 pci_read_config_dword(pdev, REG_TEMP,
                                                       &data->temp[1][1]);
@@ -135,14 +136,14 @@ static SENSOR_DEVICE_ATTR_2(temp3_input, S_IRUGO, show_temp, NULL, 1, 0);
 static SENSOR_DEVICE_ATTR_2(temp4_input, S_IRUGO, show_temp, NULL, 1, 1);
 static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
 
-static DEFINE_PCI_DEVICE_TABLE(k8temp_ids) = {
+static const struct pci_device_id k8temp_ids[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MISC) },
         { 0 },
 };
 
 MODULE_DEVICE_TABLE(pci, k8temp_ids);
 
-static int is_rev_g_desktop(u8 model)
+static int __devinit is_rev_g_desktop(u8 model)
 {
         u32 brandidx;
 
@@ -173,7 +174,7 @@ static int is_rev_g_desktop(u8 model)
         return 1;
 }
 
-static int k8temp_probe(struct pci_dev *pdev,
+static int __devinit k8temp_probe(struct pci_dev *pdev,
                                   const struct pci_device_id *id)
 {
         int err;
@@ -182,17 +183,20 @@ static int k8temp_probe(struct pci_dev *pdev,
         u8 model, stepping;
         struct k8temp_data *data;
 
-        data = devm_kzalloc(&pdev->dev, sizeof(struct k8temp_data), GFP_KERNEL);
-        if (!data)
-                return -ENOMEM;
+        if (!(data = kzalloc(sizeof(struct k8temp_data), GFP_KERNEL))) {
+                err = -ENOMEM;
+                goto exit;
+        }
 
         model = boot_cpu_data.x86_model;
         stepping = boot_cpu_data.x86_mask;
 
         /* feature available since SH-C0, exclude older revisions */
-        if ((model == 4 && stepping == 0) ||
-            (model == 5 && stepping <= 1))
-                return -ENODEV;
+        if (((model == 4) && (stepping == 0)) ||
+            ((model == 5) && (stepping <= 1))) {
+                err = -ENODEV;
+                goto exit_free;
+        }
 
         /*
          * AMD NPT family 0fh, i.e. RevF and RevG:
@@ -213,13 +217,14 @@ static int k8temp_probe(struct pci_dev *pdev,
                 data->temp_offset = 21000;
 
         pci_read_config_byte(pdev, REG_TEMP, &scfg);
-        scfg &= ~(SEL_PLACE | SEL_CORE);        /* Select sensor 0, core0 */
+        scfg &= ~(SEL_PLACE | SEL_CORE);                /* Select sensor 0, core0 */
         pci_write_config_byte(pdev, REG_TEMP, scfg);
         pci_read_config_byte(pdev, REG_TEMP, &scfg);
 
         if (scfg & (SEL_PLACE | SEL_CORE)) {
                 dev_err(&pdev->dev, "Configuration bit(s) stuck at 1!\n");
-                return -ENODEV;
+                err = -ENODEV;
+                goto exit_free;
         }
 
         scfg |= (SEL_PLACE | SEL_CORE);
@@ -233,7 +238,7 @@ static int k8temp_probe(struct pci_dev *pdev,
                 pci_write_config_byte(pdev, REG_TEMP, scfg);
                 pci_read_config_dword(pdev, REG_TEMP, &temp);
                 scfg |= SEL_CORE;       /* prepare for next selection */
-                if (!((temp >> 16) & 0xff)) /* if temp is 0 -49C is unlikely */
+                if (!((temp >> 16) & 0xff))     /* if temp is 0 -49C is not likely */
                         data->sensorsp &= ~SEL_PLACE;
         }
 
@@ -241,7 +246,7 @@ static int k8temp_probe(struct pci_dev *pdev,
                 scfg &= ~SEL_PLACE;     /* Select sensor 0, core1 */
                 pci_write_config_byte(pdev, REG_TEMP, scfg);
                 pci_read_config_dword(pdev, REG_TEMP, &temp);
-                if (!((temp >> 16) & 0xff)) /* if temp is 0 -49C is unlikely */
+                if (!((temp >> 16) & 0xff))     /* if temp is 0 -49C is not likely */
                         data->sensorsp &= ~SEL_CORE;
         }
 
@@ -301,10 +306,14 @@ exit_remove:
         device_remove_file(&pdev->dev,
                            &sensor_dev_attr_temp4_input.dev_attr);
         device_remove_file(&pdev->dev, &dev_attr_name);
+exit_free:
+        pci_set_drvdata(pdev, NULL);
+        kfree(data);
+exit:
         return err;
 }
 
-static void k8temp_remove(struct pci_dev *pdev)
+static void __devexit k8temp_remove(struct pci_dev *pdev)
 {
         struct k8temp_data *data = pci_get_drvdata(pdev);
 
@@ -318,17 +327,30 @@ static void k8temp_remove(struct pci_dev *pdev)
         device_remove_file(&pdev->dev,
                            &sensor_dev_attr_temp4_input.dev_attr);
         device_remove_file(&pdev->dev, &dev_attr_name);
+        pci_set_drvdata(pdev, NULL);
+        kfree(data);
 }
 
 static struct pci_driver k8temp_driver = {
         .name = "k8temp",
         .id_table = k8temp_ids,
         .probe = k8temp_probe,
-        .remove = k8temp_remove,
+        .remove = __devexit_p(k8temp_remove),
 };
 
-module_pci_driver(k8temp_driver);
+static int __init k8temp_init(void)
+{
+        return pci_register_driver(&k8temp_driver);
+}
+
+static void __exit k8temp_exit(void)
+{
+        pci_unregister_driver(&k8temp_driver);
+}
 
 MODULE_AUTHOR("Rudolf Marek <r.marek@assembler.cz>");
 MODULE_DESCRIPTION("AMD K8 core temperature monitor");
 MODULE_LICENSE("GPL");
+
+module_init(k8temp_init)
+module_exit(k8temp_exit)