Patched in Tegra support.

1 files changed, 51 insertions, 51 deletions

diff --git a/drivers/hwmon/thmc50.c b/drivers/hwmon/thmc50.c
index 3c2c48d904e..7dfb4dec4c5 100644
--- a/drivers/hwmon/thmc50.c
+++ b/drivers/hwmon/thmc50.c
@@ -1,24 +1,24 @@
 /*
- * thmc50.c - Part of lm_sensors, Linux kernel modules for hardware
- *            monitoring
- * Copyright (C) 2007 Krzysztof Helt <krzysztof.h1@wp.pl>
- * Based on 2.4 driver by Frodo Looijaard <frodol@dds.nl> and
- * Philip Edelbrock <phil@netroedge.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
+    thmc50.c - Part of lm_sensors, Linux kernel modules for hardware
+             monitoring
+    Copyright (C) 2007 Krzysztof Helt <krzysztof.h1@wp.pl>
+    Based on 2.4 driver by Frodo Looijaard <frodol@dds.nl> and
+    Philip Edelbrock <phil@netroedge.com>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
 
 #include <linux/module.h>
 #include <linux/init.h>
@@ -28,7 +28,6 @@
 #include <linux/hwmon-sysfs.h>
 #include <linux/err.h>
 #include <linux/mutex.h>
-#include <linux/jiffies.h>
 
 MODULE_LICENSE("GPL");
 
@@ -125,13 +124,8 @@ static ssize_t set_analog_out(struct device *dev,
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct thmc50_data *data = i2c_get_clientdata(client);
+        int tmp = simple_strtoul(buf, NULL, 10);
         int config;
-        unsigned long tmp;
-        int err;
-
-        err = kstrtoul(buf, 10, &tmp);
-        if (err)
-                return err;
 
         mutex_lock(&data->update_lock);
         data->analog_out = SENSORS_LIMIT(tmp, 0, 255);
@@ -179,12 +173,7 @@ static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,
         int nr = to_sensor_dev_attr(attr)->index;
         struct i2c_client *client = to_i2c_client(dev);
         struct thmc50_data *data = i2c_get_clientdata(client);
-        long val;
-        int err;
-
-        err = kstrtol(buf, 10, &val);
-        if (err)
-                return err;
+        int val = simple_strtol(buf, NULL, 10);
 
         mutex_lock(&data->update_lock);
         data->temp_min[nr] = SENSORS_LIMIT(val / 1000, -128, 127);
@@ -208,12 +197,7 @@ static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,
         int nr = to_sensor_dev_attr(attr)->index;
         struct i2c_client *client = to_i2c_client(dev);
         struct thmc50_data *data = i2c_get_clientdata(client);
-        long val;
-        int err;
-
-        err = kstrtol(buf, 10, &val);
-        if (err)
-                return err;
+        int val = simple_strtol(buf, NULL, 10);
 
         mutex_lock(&data->update_lock);
         data->temp_max[nr] = SENSORS_LIMIT(val / 1000, -128, 127);
@@ -362,10 +346,12 @@ static int thmc50_probe(struct i2c_client *client,
         struct thmc50_data *data;
         int err;
 
-        data = devm_kzalloc(&client->dev, sizeof(struct thmc50_data),
-                            GFP_KERNEL);
-        if (!data)
-                return -ENOMEM;
+        data = kzalloc(sizeof(struct thmc50_data), GFP_KERNEL);
+        if (!data) {
+                pr_debug("thmc50: detect failed, kzalloc failed!\n");
+                err = -ENOMEM;
+                goto exit;
+        }
 
         i2c_set_clientdata(client, data);
         data->type = id->driver_data;
@@ -374,16 +360,14 @@ static int thmc50_probe(struct i2c_client *client,
         thmc50_init_client(client);
 
         /* Register sysfs hooks */
-        err = sysfs_create_group(&client->dev.kobj, &thmc50_group);
-        if (err)
-                return err;
+        if ((err = sysfs_create_group(&client->dev.kobj, &thmc50_group)))
+                goto exit_free;
 
         /* Register ADM1022 sysfs hooks */
-        if (data->has_temp3) {
-                err = sysfs_create_group(&client->dev.kobj, &temp3_group);
-                if (err)
+        if (data->has_temp3)
+                if ((err = sysfs_create_group(&client->dev.kobj,
+                                              &temp3_group)))
                         goto exit_remove_sysfs_thmc50;
-        }
 
         /* Register a new directory entry with module sensors */
         data->hwmon_dev = hwmon_device_register(&client->dev);
@@ -399,6 +383,9 @@ exit_remove_sysfs:
                 sysfs_remove_group(&client->dev.kobj, &temp3_group);
 exit_remove_sysfs_thmc50:
         sysfs_remove_group(&client->dev.kobj, &thmc50_group);
+exit_free:
+        kfree(data);
+exit:
         return err;
 }
 
@@ -411,6 +398,8 @@ static int thmc50_remove(struct i2c_client *client)
         if (data->has_temp3)
                 sysfs_remove_group(&client->dev.kobj, &temp3_group);
 
+        kfree(data);
+
         return 0;
 }
 
@@ -476,7 +465,18 @@ static struct thmc50_data *thmc50_update_device(struct device *dev)
         return data;
 }
 
-module_i2c_driver(thmc50_driver);
+static int __init sm_thmc50_init(void)
+{
+        return i2c_add_driver(&thmc50_driver);
+}
+
+static void __exit sm_thmc50_exit(void)
+{
+        i2c_del_driver(&thmc50_driver);
+}
 
 MODULE_AUTHOR("Krzysztof Helt <krzysztof.h1@wp.pl>");
 MODULE_DESCRIPTION("THMC50 driver");
+
+module_init(sm_thmc50_init);
+module_exit(sm_thmc50_exit);