Patched in Tegra support.

1 files changed, 54 insertions, 63 deletions

diff --git a/drivers/hwmon/adm1021.c b/drivers/hwmon/adm1021.c
index fd1d1b15854..1ad0a885c5a 100644
--- a/drivers/hwmon/adm1021.c
+++ b/drivers/hwmon/adm1021.c
@@ -1,23 +1,23 @@
 /*
- * adm1021.c - Part of lm_sensors, Linux kernel modules for hardware
- *             monitoring
- * Copyright (c) 1998, 1999  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.
- */
+    adm1021.c - Part of lm_sensors, Linux kernel modules for hardware
+                monitoring
+    Copyright (c) 1998, 1999  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>
@@ -70,12 +70,10 @@ enum chips {
 
 /* Initial values */
 
-/*
- * Note: Even though I left the low and high limits named os and hyst,
- * they don't quite work like a thermostat the way the LM75 does.  I.e.,
- * a lower temp than THYST actually triggers an alarm instead of
- * clearing it.  Weird, ey?   --Phil
- */
+/* Note: Even though I left the low and high limits named os and hyst,
+they don't quite work like a thermostat the way the LM75 does.  I.e.,
+a lower temp than THYST actually triggers an alarm instead of
+clearing it.  Weird, ey?   --Phil  */
 
 /* Each client has this additional data */
 struct adm1021_data {
@@ -105,7 +103,7 @@ static int adm1021_remove(struct i2c_client *client);
 static struct adm1021_data *adm1021_update_device(struct device *dev);
 
 /* (amalysh) read only mode, otherwise any limit's writing confuse BIOS */
-static bool read_only;
+static int read_only;
 
 
 static const struct i2c_device_id adm1021_id[] = {
@@ -184,13 +182,7 @@ static ssize_t set_temp_max(struct device *dev,
         int index = to_sensor_dev_attr(devattr)->index;
         struct i2c_client *client = to_i2c_client(dev);
         struct adm1021_data *data = i2c_get_clientdata(client);
-        long temp;
-        int err;
-
-        err = kstrtol(buf, 10, &temp);
-        if (err)
-                return err;
-        temp /= 1000;
+        long temp = simple_strtol(buf, NULL, 10) / 1000;
 
         mutex_lock(&data->update_lock);
         data->temp_max[index] = SENSORS_LIMIT(temp, -128, 127);
@@ -209,13 +201,7 @@ static ssize_t set_temp_min(struct device *dev,
         int index = to_sensor_dev_attr(devattr)->index;
         struct i2c_client *client = to_i2c_client(dev);
         struct adm1021_data *data = i2c_get_clientdata(client);
-        long temp;
-        int err;
-
-        err = kstrtol(buf, 10, &temp);
-        if (err)
-                return err;
-        temp /= 1000;
+        long temp = simple_strtol(buf, NULL, 10) / 1000;
 
         mutex_lock(&data->update_lock);
         data->temp_min[index] = SENSORS_LIMIT(temp, -128, 127);
@@ -240,14 +226,7 @@ static ssize_t set_low_power(struct device *dev,
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct adm1021_data *data = i2c_get_clientdata(client);
-        char low_power;
-        unsigned long val;
-        int err;
-
-        err = kstrtoul(buf, 10, &val);
-        if (err)
-                return err;
-        low_power = val != 0;
+        int low_power = simple_strtol(buf, NULL, 10) != 0;
 
         mutex_lock(&data->update_lock);
         if (low_power != data->low_power) {
@@ -366,11 +345,11 @@ static int adm1021_probe(struct i2c_client *client,
         struct adm1021_data *data;
         int err;
 
-        data = devm_kzalloc(&client->dev, sizeof(struct adm1021_data),
-                            GFP_KERNEL);
+        data = kzalloc(sizeof(struct adm1021_data), GFP_KERNEL);
         if (!data) {
-                pr_debug("adm1021: detect failed, devm_kzalloc failed!\n");
-                return -ENOMEM;
+                pr_debug("adm1021: detect failed, kzalloc failed!\n");
+                err = -ENOMEM;
+                goto error0;
         }
 
         i2c_set_clientdata(client, data);
@@ -382,20 +361,22 @@ static int adm1021_probe(struct i2c_client *client,
                 adm1021_init_client(client);
 
         /* Register sysfs hooks */
-        err = sysfs_create_group(&client->dev.kobj, &adm1021_group);
-        if (err)
-                return err;
+        if ((err = sysfs_create_group(&client->dev.kobj, &adm1021_group)))
+                goto error1;
 
         data->hwmon_dev = hwmon_device_register(&client->dev);
         if (IS_ERR(data->hwmon_dev)) {
                 err = PTR_ERR(data->hwmon_dev);
-                goto error;
+                goto error3;
         }
 
         return 0;
 
-error:
+error3:
         sysfs_remove_group(&client->dev.kobj, &adm1021_group);
+error1:
+        kfree(data);
+error0:
         return err;
 }
 
@@ -415,6 +396,7 @@ static int adm1021_remove(struct i2c_client *client)
         hwmon_device_unregister(data->hwmon_dev);
         sysfs_remove_group(&client->dev.kobj, &adm1021_group);
 
+        kfree(data);
         return 0;
 }
 
@@ -445,10 +427,8 @@ static struct adm1021_data *adm1021_update_device(struct device *dev)
                 data->alarms = i2c_smbus_read_byte_data(client,
                                                 ADM1021_REG_STATUS) & 0x7c;
                 if (data->type == adm1023) {
-                        /*
-                         * The ADM1023 provides 3 extra bits of precision for
-                         * the remote sensor in extra registers.
-                         */
+                        /* The ADM1023 provides 3 extra bits of precision for
+                         * the remote sensor in extra registers. */
                         data->temp[1] += 125 * (i2c_smbus_read_byte_data(
                                 client, ADM1023_REG_REM_TEMP_PREC) >> 5);
                         data->temp_max[1] += 125 * (i2c_smbus_read_byte_data(
@@ -471,12 +451,23 @@ static struct adm1021_data *adm1021_update_device(struct device *dev)
         return data;
 }
 
-module_i2c_driver(adm1021_driver);
+static int __init sensors_adm1021_init(void)
+{
+        return i2c_add_driver(&adm1021_driver);
+}
+
+static void __exit sensors_adm1021_exit(void)
+{
+        i2c_del_driver(&adm1021_driver);
+}
 
-MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl> and "
+MODULE_AUTHOR ("Frodo Looijaard <frodol@dds.nl> and "
                 "Philip Edelbrock <phil@netroedge.com>");
 MODULE_DESCRIPTION("adm1021 driver");
 MODULE_LICENSE("GPL");
 
 module_param(read_only, bool, 0);
 MODULE_PARM_DESC(read_only, "Don't set any values, read only mode");
+
+module_init(sensors_adm1021_init)
+module_exit(sensors_adm1021_exit)