Patched in Tegra support.

1 files changed, 31 insertions, 22 deletions

diff --git a/drivers/hwmon/max1619.c b/drivers/hwmon/max1619.c
index 445e5d40ac8..022ded09810 100644
--- a/drivers/hwmon/max1619.c
+++ b/drivers/hwmon/max1619.c
@@ -1,7 +1,7 @@
 /*
  * max1619.c - Part of lm_sensors, Linux kernel modules for hardware
  *             monitoring
- * Copyright (C) 2003-2004 Oleksij Rempel <bug-track@fisher-privat.net>
+ * Copyright (C) 2003-2004 Alexey Fisher <fishor@mail.ru>
  *                         Jean Delvare <khali@linux-fr.org>
  *
  * Based on the lm90 driver. The MAX1619 is a sensor chip made by Maxim.
@@ -125,7 +125,7 @@ struct max1619_data {
         u8 temp_input2, temp_low2, temp_high2; /* remote */
         u8 temp_crit2;
         u8 temp_hyst2;
-        u8 alarms;
+        u8 alarms; 
 };
 
 /*
@@ -133,8 +133,7 @@ struct max1619_data {
  */
 
 #define show_temp(value) \
-static ssize_t show_##value(struct device *dev, struct device_attribute *attr, \
-                            char *buf) \
+static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct max1619_data *data = max1619_update_device(dev); \
         return sprintf(buf, "%d\n", temp_from_reg(data->value)); \
@@ -147,17 +146,13 @@ show_temp(temp_crit2);
 show_temp(temp_hyst2);
 
 #define set_temp2(value, reg) \
-static ssize_t set_##value(struct device *dev, struct device_attribute *attr, \
-                           const char *buf, \
+static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
         struct max1619_data *data = i2c_get_clientdata(client); \
-        long val; \
-        int err = kstrtol(buf, 10, &val); \
-        if (err) \
-                return err; \
-\
+        long val = simple_strtol(buf, NULL, 10); \
+ \
         mutex_lock(&data->update_lock); \
         data->value = temp_to_reg(val); \
         i2c_smbus_write_byte_data(client, reg, data->value); \
@@ -170,8 +165,7 @@ set_temp2(temp_high2, MAX1619_REG_W_REMOTE_HIGH);
 set_temp2(temp_crit2, MAX1619_REG_W_REMOTE_CRIT);
 set_temp2(temp_hyst2, MAX1619_REG_W_TCRIT_HYST);
 
-static ssize_t show_alarms(struct device *dev, struct device_attribute *attr,
-                           char *buf)
+static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct max1619_data *data = max1619_update_device(dev);
         return sprintf(buf, "%d\n", data->alarms);
@@ -267,10 +261,11 @@ static int max1619_probe(struct i2c_client *new_client,
         struct max1619_data *data;
         int err;
 
-        data = devm_kzalloc(&new_client->dev, sizeof(struct max1619_data),
-                            GFP_KERNEL);
-        if (!data)
-                return -ENOMEM;
+        data = kzalloc(sizeof(struct max1619_data), GFP_KERNEL);
+        if (!data) {
+                err = -ENOMEM;
+                goto exit;
+        }
 
         i2c_set_clientdata(new_client, data);
         data->valid = 0;
@@ -280,9 +275,8 @@ static int max1619_probe(struct i2c_client *new_client,
         max1619_init_client(new_client);
 
         /* Register sysfs hooks */
-        err = sysfs_create_group(&new_client->dev.kobj, &max1619_group);
-        if (err)
-                return err;
+        if ((err = sysfs_create_group(&new_client->dev.kobj, &max1619_group)))
+                goto exit_free;
 
         data->hwmon_dev = hwmon_device_register(&new_client->dev);
         if (IS_ERR(data->hwmon_dev)) {
@@ -294,6 +288,9 @@ static int max1619_probe(struct i2c_client *new_client,
 
 exit_remove_files:
         sysfs_remove_group(&new_client->dev.kobj, &max1619_group);
+exit_free:
+        kfree(data);
+exit:
         return err;
 }
 
@@ -319,6 +316,7 @@ static int max1619_remove(struct i2c_client *client)
         hwmon_device_unregister(data->hwmon_dev);
         sysfs_remove_group(&client->dev.kobj, &max1619_group);
 
+        kfree(data);
         return 0;
 }
 
@@ -355,9 +353,20 @@ static struct max1619_data *max1619_update_device(struct device *dev)
         return data;
 }
 
-module_i2c_driver(max1619_driver);
+static int __init sensors_max1619_init(void)
+{
+        return i2c_add_driver(&max1619_driver);
+}
 
-MODULE_AUTHOR("Oleksij Rempel <bug-track@fisher-privat.net> and "
+static void __exit sensors_max1619_exit(void)
+{
+        i2c_del_driver(&max1619_driver);
+}
+
+MODULE_AUTHOR("Alexey Fisher <fishor@mail.ru> and "
         "Jean Delvare <khali@linux-fr.org>");
 MODULE_DESCRIPTION("MAX1619 sensor driver");
 MODULE_LICENSE("GPL");
+
+module_init(sensors_max1619_init);
+module_exit(sensors_max1619_exit);