Patched in Tegra support.

1 files changed, 45 insertions, 24 deletions

diff --git a/drivers/hwmon/ad7418.c b/drivers/hwmon/ad7418.c
index 57d4a629567..ffc781fec18 100644
--- a/drivers/hwmon/ad7418.c
+++ b/drivers/hwmon/ad7418.c
@@ -76,6 +76,20 @@ static struct i2c_driver ad7418_driver = {
         .id_table       = ad7418_id,
 };
 
+/* All registers are word-sized, except for the configuration registers.
+ * AD7418 uses a high-byte first convention. Do NOT use those functions to
+ * access the configuration registers CONF and CONF2, as they are byte-sized.
+ */
+static inline int ad7418_read(struct i2c_client *client, u8 reg)
+{
+        return swab16(i2c_smbus_read_word_data(client, reg));
+}
+
+static inline int ad7418_write(struct i2c_client *client, u8 reg, u16 value)
+{
+        return i2c_smbus_write_word_data(client, reg, swab16(value));
+}
+
 static void ad7418_init_client(struct i2c_client *client)
 {
         struct ad7418_data *data = i2c_get_clientdata(client);
@@ -114,9 +128,7 @@ static struct ad7418_data *ad7418_update_device(struct device *dev)
                 udelay(30);
 
                 for (i = 0; i < 3; i++) {
-                        data->temp[i] =
-                                i2c_smbus_read_word_swapped(client,
-                                                AD7418_REG_TEMP[i]);
+                        data->temp[i] = ad7418_read(client, AD7418_REG_TEMP[i]);
                 }
 
                 for (i = 0, ch = 4; i < data->adc_max; i++, ch--) {
@@ -126,12 +138,11 @@ static struct ad7418_data *ad7418_update_device(struct device *dev)
 
                         udelay(15);
                         data->in[data->adc_max - 1 - i] =
-                                i2c_smbus_read_word_swapped(client,
-                                                AD7418_REG_ADC);
+                                ad7418_read(client, AD7418_REG_ADC);
                 }
 
                 /* restore old configuration value */
-                i2c_smbus_write_word_swapped(client, AD7418_REG_CONF, cfg);
+                ad7418_write(client, AD7418_REG_CONF, cfg);
 
                 data->last_updated = jiffies;
                 data->valid = 1;
@@ -167,17 +178,11 @@ static ssize_t set_temp(struct device *dev, struct device_attribute *devattr,
         struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
         struct i2c_client *client = to_i2c_client(dev);
         struct ad7418_data *data = i2c_get_clientdata(client);
-        long temp;
-        int ret = kstrtol(buf, 10, &temp);
-
-        if (ret < 0)
-                return ret;
+        long temp = simple_strtol(buf, NULL, 10);
 
         mutex_lock(&data->lock);
         data->temp[attr->index] = LM75_TEMP_TO_REG(temp);
-        i2c_smbus_write_word_swapped(client,
-                                     AD7418_REG_TEMP[attr->index],
-                                     data->temp[attr->index]);
+        ad7418_write(client, AD7418_REG_TEMP[attr->index], data->temp[attr->index]);
         mutex_unlock(&data->lock);
         return count;
 }
@@ -227,13 +232,15 @@ static int ad7418_probe(struct i2c_client *client,
         int err;
 
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA |
-                                        I2C_FUNC_SMBUS_WORD_DATA))
-                return -EOPNOTSUPP;
+                                        I2C_FUNC_SMBUS_WORD_DATA)) {
+                err = -EOPNOTSUPP;
+                goto exit;
+        }
 
-        data = devm_kzalloc(&client->dev, sizeof(struct ad7418_data),
-                            GFP_KERNEL);
-        if (!data)
-                return -ENOMEM;
+        if (!(data = kzalloc(sizeof(struct ad7418_data), GFP_KERNEL))) {
+                err = -ENOMEM;
+                goto exit;
+        }
 
         i2c_set_clientdata(client, data);
 
@@ -263,9 +270,8 @@ static int ad7418_probe(struct i2c_client *client,
         ad7418_init_client(client);
 
         /* Register sysfs hooks */
-        err = sysfs_create_group(&client->dev.kobj, &data->attrs);
-        if (err)
-                return err;
+        if ((err = sysfs_create_group(&client->dev.kobj, &data->attrs)))
+                goto exit_free;
 
         data->hwmon_dev = hwmon_device_register(&client->dev);
         if (IS_ERR(data->hwmon_dev)) {
@@ -277,6 +283,9 @@ static int ad7418_probe(struct i2c_client *client,
 
 exit_remove:
         sysfs_remove_group(&client->dev.kobj, &data->attrs);
+exit_free:
+        kfree(data);
+exit:
         return err;
 }
 
@@ -285,12 +294,24 @@ static int ad7418_remove(struct i2c_client *client)
         struct ad7418_data *data = i2c_get_clientdata(client);
         hwmon_device_unregister(data->hwmon_dev);
         sysfs_remove_group(&client->dev.kobj, &data->attrs);
+        kfree(data);
         return 0;
 }
 
-module_i2c_driver(ad7418_driver);
+static int __init ad7418_init(void)
+{
+        return i2c_add_driver(&ad7418_driver);
+}
+
+static void __exit ad7418_exit(void)
+{
+        i2c_del_driver(&ad7418_driver);
+}
 
 MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
 MODULE_DESCRIPTION("AD7416/17/18 driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
+
+module_init(ad7418_init);
+module_exit(ad7418_exit);