Patched in Tegra support.

1 files changed, 40 insertions, 38 deletions

diff --git a/drivers/hwmon/ads7871.c b/drivers/hwmon/ads7871.c
index a79875986f9..52319340e18 100644
--- a/drivers/hwmon/ads7871.c
+++ b/drivers/hwmon/ads7871.c
@@ -34,11 +34,9 @@
 #define REG_SER_CONTROL 24 /*Serial Interface Control Register*/
 #define REG_ID          31 /*ID Register*/
 
-/*
- * From figure 17 in the datasheet
- * These bits get ORed with the address to form
- * the instruction byte
- */
+/*From figure 17 in the datasheet
+* These bits get ORed with the address to form
+* the instruction byte */
 /*Instruction Bit masks*/
 #define INST_MODE_bm    (1<<7)
 #define INST_READ_bm    (1<<6)
@@ -107,10 +105,8 @@ static ssize_t show_voltage(struct device *dev,
         uint8_t channel, mux_cnv;
 
         channel = attr->index;
-        /*
-         * TODO: add support for conversions
-         * other than single ended with a gain of 1
-         */
+        /*TODO: add support for conversions
+         *other than single ended with a gain of 1*/
         /*MUX_M3_bm forces single ended*/
         /*This is also where the gain of the PGA would be set*/
         ads7871_write_reg8(spi, REG_GAIN_MUX,
@@ -118,10 +114,8 @@ static ssize_t show_voltage(struct device *dev,
 
         ret = ads7871_read_reg8(spi, REG_GAIN_MUX);
         mux_cnv = ((ret & MUX_CNV_bm)>>MUX_CNV_bv);
-        /*
-         * on 400MHz arm9 platform the conversion
-         * is already done when we do this test
-         */
+        /*on 400MHz arm9 platform the conversion
+         *is already done when we do this test*/
         while ((i < 2) && mux_cnv) {
                 i++;
                 ret = ads7871_read_reg8(spi, REG_GAIN_MUX);
@@ -139,12 +133,6 @@ static ssize_t show_voltage(struct device *dev,
         }
 }
 
-static ssize_t ads7871_show_name(struct device *dev,
-                                 struct device_attribute *devattr, char *buf)
-{
-        return sprintf(buf, "%s\n", to_spi_device(dev)->modalias);
-}
-
 static SENSOR_DEVICE_ATTR(in0_input, S_IRUGO, show_voltage, NULL, 0);
 static SENSOR_DEVICE_ATTR(in1_input, S_IRUGO, show_voltage, NULL, 1);
 static SENSOR_DEVICE_ATTR(in2_input, S_IRUGO, show_voltage, NULL, 2);
@@ -154,8 +142,6 @@ static SENSOR_DEVICE_ATTR(in5_input, S_IRUGO, show_voltage, NULL, 5);
 static SENSOR_DEVICE_ATTR(in6_input, S_IRUGO, show_voltage, NULL, 6);
 static SENSOR_DEVICE_ATTR(in7_input, S_IRUGO, show_voltage, NULL, 7);
 
-static DEVICE_ATTR(name, S_IRUGO, ads7871_show_name, NULL);
-
 static struct attribute *ads7871_attributes[] = {
         &sensor_dev_attr_in0_input.dev_attr.attr,
         &sensor_dev_attr_in1_input.dev_attr.attr,
@@ -165,7 +151,6 @@ static struct attribute *ads7871_attributes[] = {
         &sensor_dev_attr_in5_input.dev_attr.attr,
         &sensor_dev_attr_in6_input.dev_attr.attr,
         &sensor_dev_attr_in7_input.dev_attr.attr,
-        &dev_attr_name.attr,
         NULL
 };
 
@@ -173,7 +158,7 @@ static const struct attribute_group ads7871_group = {
         .attrs = ads7871_attributes,
 };
 
-static int ads7871_probe(struct spi_device *spi)
+static int __devinit ads7871_probe(struct spi_device *spi)
 {
         int ret, err;
         uint8_t val;
@@ -194,21 +179,22 @@ static int ads7871_probe(struct spi_device *spi)
         ret = ads7871_read_reg8(spi, REG_OSC_CONTROL);
 
         dev_dbg(&spi->dev, "REG_OSC_CONTROL write:%x, read:%x\n", val, ret);
-        /*
-         * because there is no other error checking on an SPI bus
-         * we need to make sure we really have a chip
-         */
-        if (val != ret)
-                return -ENODEV;
-
-        pdata = devm_kzalloc(&spi->dev, sizeof(struct ads7871_data),
-                             GFP_KERNEL);
-        if (!pdata)
-                return -ENOMEM;
+        /*because there is no other error checking on an SPI bus
+        we need to make sure we really have a chip*/
+        if (val != ret) {
+                err = -ENODEV;
+                goto exit;
+        }
+
+        pdata = kzalloc(sizeof(struct ads7871_data), GFP_KERNEL);
+        if (!pdata) {
+                err = -ENOMEM;
+                goto exit;
+        }
 
         err = sysfs_create_group(&spi->dev.kobj, &ads7871_group);
         if (err < 0)
-                return err;
+                goto error_free;
 
         spi_set_drvdata(spi, pdata);
 
@@ -222,29 +208,45 @@ static int ads7871_probe(struct spi_device *spi)
 
 error_remove:
         sysfs_remove_group(&spi->dev.kobj, &ads7871_group);
+error_free:
+        kfree(pdata);
+exit:
         return err;
 }
 
-static int ads7871_remove(struct spi_device *spi)
+static int __devexit ads7871_remove(struct spi_device *spi)
 {
         struct ads7871_data *pdata = spi_get_drvdata(spi);
 
         hwmon_device_unregister(pdata->hwmon_dev);
         sysfs_remove_group(&spi->dev.kobj, &ads7871_group);
+        kfree(pdata);
         return 0;
 }
 
 static struct spi_driver ads7871_driver = {
         .driver = {
                 .name = DEVICE_NAME,
+                .bus = &spi_bus_type,
                 .owner = THIS_MODULE,
         },
 
         .probe = ads7871_probe,
-        .remove = ads7871_remove,
+        .remove = __devexit_p(ads7871_remove),
 };
 
-module_spi_driver(ads7871_driver);
+static int __init ads7871_init(void)
+{
+        return spi_register_driver(&ads7871_driver);
+}
+
+static void __exit ads7871_exit(void)
+{
+        spi_unregister_driver(&ads7871_driver);
+}
+
+module_init(ads7871_init);
+module_exit(ads7871_exit);
 
 MODULE_AUTHOR("Paul Thomas <pthomas8589@gmail.com>");
 MODULE_DESCRIPTION("TI ADS7871 A/D driver");