Patched in Tegra support.

1 files changed, 25 insertions, 12 deletions

diff --git a/drivers/hwmon/ltc4245.c b/drivers/hwmon/ltc4245.c
index 3653f79dc2d..65930832930 100644
--- a/drivers/hwmon/ltc4245.c
+++ b/drivers/hwmon/ltc4245.c
@@ -21,7 +21,6 @@
 #include <linux/i2c.h>
 #include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
-#include <linux/jiffies.h>
 #include <linux/i2c/ltc4245.h>
 
 /* Here are names of the chip's registers (a.k.a. commands) */
@@ -215,8 +214,7 @@ static unsigned int ltc4245_get_current(struct device *dev, u8 reg)
         unsigned int voltage;
         unsigned int curr;
 
-        /*
-         * The strange looking conversions that follow are fixed-point
+        /* The strange looking conversions that follow are fixed-point
          * math, since we cannot do floating point in the kernel.
          *
          * Step 1: convert sense register to microVolts
@@ -319,8 +317,7 @@ static ssize_t ltc4245_show_gpio(struct device *dev,
         return snprintf(buf, PAGE_SIZE, "%u\n", val * 10);
 }
 
-/*
- * These macros are used below in constructing device attribute objects
+/* These macros are used below in constructing device attribute objects
  * for use with sysfs_create_group() to make a sysfs device file
  * for each register.
  */
@@ -394,8 +391,7 @@ LTC4245_POWER(power2_input,			LTC4245_5VSENSE);
 LTC4245_POWER(power3_input,                     LTC4245_3VSENSE);
 LTC4245_POWER(power4_input,                     LTC4245_VEESENSE);
 
-/*
- * Finally, construct an array of pointers to members of the above objects,
+/* Finally, construct an array of pointers to members of the above objects,
  * as required for sysfs_create_group()
  */
 static struct attribute *ltc4245_std_attributes[] = {
@@ -520,9 +516,11 @@ static int ltc4245_probe(struct i2c_client *client,
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                 return -ENODEV;
 
-        data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL);
-        if (!data)
-                return -ENOMEM;
+        data = kzalloc(sizeof(*data), GFP_KERNEL);
+        if (!data) {
+                ret = -ENOMEM;
+                goto out_kzalloc;
+        }
 
         i2c_set_clientdata(client, data);
         mutex_init(&data->update_lock);
@@ -535,7 +533,7 @@ static int ltc4245_probe(struct i2c_client *client,
         /* Register sysfs hooks */
         ret = ltc4245_sysfs_create_groups(client);
         if (ret)
-                return ret;
+                goto out_sysfs_create_groups;
 
         data->hwmon_dev = hwmon_device_register(&client->dev);
         if (IS_ERR(data->hwmon_dev)) {
@@ -547,6 +545,9 @@ static int ltc4245_probe(struct i2c_client *client,
 
 out_hwmon_device_register:
         ltc4245_sysfs_remove_groups(client);
+out_sysfs_create_groups:
+        kfree(data);
+out_kzalloc:
         return ret;
 }
 
@@ -556,6 +557,7 @@ static int ltc4245_remove(struct i2c_client *client)
 
         hwmon_device_unregister(data->hwmon_dev);
         ltc4245_sysfs_remove_groups(client);
+        kfree(data);
 
         return 0;
 }
@@ -576,8 +578,19 @@ static struct i2c_driver ltc4245_driver = {
         .id_table       = ltc4245_id,
 };
 
-module_i2c_driver(ltc4245_driver);
+static int __init ltc4245_init(void)
+{
+        return i2c_add_driver(&ltc4245_driver);
+}
+
+static void __exit ltc4245_exit(void)
+{
+        i2c_del_driver(&ltc4245_driver);
+}
 
 MODULE_AUTHOR("Ira W. Snyder <iws@ovro.caltech.edu>");
 MODULE_DESCRIPTION("LTC4245 driver");
 MODULE_LICENSE("GPL");
+
+module_init(ltc4245_init);
+module_exit(ltc4245_exit);