Patched in Tegra support.

1 files changed, 46 insertions, 28 deletions

diff --git a/drivers/hwmon/adt7462.c b/drivers/hwmon/adt7462.c
index 98a7d81e25c..2af0c7b6b4e 100644
--- a/drivers/hwmon/adt7462.c
+++ b/drivers/hwmon/adt7462.c
@@ -26,6 +26,7 @@
 #include <linux/hwmon-sysfs.h>
 #include <linux/err.h>
 #include <linux/mutex.h>
+#include <linux/delay.h>
 #include <linux/log2.h>
 #include <linux/slab.h>
 
@@ -64,8 +65,8 @@ static const unsigned short normal_i2c[] = { 0x58, 0x5C, I2C_CLIENT_END };
 #define ADT7462_REG_PWM_TEMP_MIN_MAX_ADDR       0x5F
 #define ADT7462_REG_PWM_TEMP_RANGE_BASE_ADDR    0x60
 #define ADT7462_REG_PWM_TEMP_RANGE_MAX_ADDR     0x63
-#define ADT7462_PWM_HYST_MASK                   0x0F
-#define ADT7462_PWM_RANGE_MASK                  0xF0
+#define         ADT7462_PWM_HYST_MASK           0x0F
+#define         ADT7462_PWM_RANGE_MASK          0xF0
 #define         ADT7462_PWM_RANGE_SHIFT         4
 #define ADT7462_REG_PWM_CFG_BASE_ADDR           0x21
 #define ADT7462_REG_PWM_CFG_MAX_ADDR            0x24
@@ -84,7 +85,7 @@ static const unsigned short normal_i2c[] = { 0x58, 0x5C, I2C_CLIENT_END };
 #define         ADT7462_PIN15_INPUT             0x20
 #define         ADT7462_PIN13_INPUT             0x40
 #define         ADT7462_PIN8_INPUT              0x80
-#define         ADT7462_PIN23_MASK              0x03
+#define         ADT7462_PIN23_MASK              0x03
 #define         ADT7462_PIN23_SHIFT             0
 #define         ADT7462_PIN26_MASK              0x0C    /* cfg2 */
 #define         ADT7462_PIN26_SHIFT             2
@@ -98,7 +99,7 @@ static const unsigned short normal_i2c[] = { 0x58, 0x5C, I2C_CLIENT_END };
 #define         ADT7462_PIN28_VOLT              0x5
 
 #define ADT7462_REG_ALARM1                      0xB8
-#define ADT7462_LT_ALARM                        0x02
+#define         ADT7462_LT_ALARM                0x02
 #define         ADT7462_R1T_ALARM               0x04
 #define         ADT7462_R2T_ALARM               0x08
 #define         ADT7462_R3T_ALARM               0x10
@@ -134,9 +135,9 @@ static const unsigned short normal_i2c[] = { 0x58, 0x5C, I2C_CLIENT_END };
 #define ADT7462_ALARM_FLAG_MASK                 0x0F
 
 #define ADT7462_TEMP_COUNT              4
-#define ADT7462_TEMP_REG(x)             (ADT7462_REG_TEMP_BASE_ADDR + ((x) * 2))
-#define ADT7462_TEMP_MIN_REG(x)         (ADT7462_REG_MIN_TEMP_BASE_ADDR + (x))
-#define ADT7462_TEMP_MAX_REG(x)         (ADT7462_REG_MAX_TEMP_BASE_ADDR + (x))
+#define ADT7462_TEMP_REG(x)             (ADT7462_REG_TEMP_BASE_ADDR + (x * 2))
+#define ADT7462_TEMP_MIN_REG(x)         (ADT7462_REG_MIN_TEMP_BASE_ADDR + (x))
+#define ADT7462_TEMP_MAX_REG(x)         (ADT7462_REG_MAX_TEMP_BASE_ADDR + (x))
 #define TEMP_FRAC_OFFSET                6
 
 #define ADT7462_FAN_COUNT               8
@@ -832,7 +833,7 @@ static ssize_t set_temp_min(struct device *dev,
         struct adt7462_data *data = i2c_get_clientdata(client);
         long temp;
 
-        if (kstrtol(buf, 10, &temp) || !temp_enabled(data, attr->index))
+        if (strict_strtol(buf, 10, &temp) || !temp_enabled(data, attr->index))
                 return -EINVAL;
 
         temp = DIV_ROUND_CLOSEST(temp, 1000) + 64;
@@ -870,7 +871,7 @@ static ssize_t set_temp_max(struct device *dev,
         struct adt7462_data *data = i2c_get_clientdata(client);
         long temp;
 
-        if (kstrtol(buf, 10, &temp) || !temp_enabled(data, attr->index))
+        if (strict_strtol(buf, 10, &temp) || !temp_enabled(data, attr->index))
                 return -EINVAL;
 
         temp = DIV_ROUND_CLOSEST(temp, 1000) + 64;
@@ -934,7 +935,7 @@ static ssize_t set_volt_max(struct device *dev,
         int x = voltage_multiplier(data, attr->index);
         long temp;
 
-        if (kstrtol(buf, 10, &temp) || !x)
+        if (strict_strtol(buf, 10, &temp) || !x)
                 return -EINVAL;
 
         temp *= 1000; /* convert mV to uV */
@@ -976,7 +977,7 @@ static ssize_t set_volt_min(struct device *dev,
         int x = voltage_multiplier(data, attr->index);
         long temp;
 
-        if (kstrtol(buf, 10, &temp) || !x)
+        if (strict_strtol(buf, 10, &temp) || !x)
                 return -EINVAL;
 
         temp *= 1000; /* convert mV to uV */
@@ -1065,7 +1066,7 @@ static ssize_t set_fan_min(struct device *dev,
         struct adt7462_data *data = i2c_get_clientdata(client);
         long temp;
 
-        if (kstrtol(buf, 10, &temp) || !temp ||
+        if (strict_strtol(buf, 10, &temp) || !temp ||
             !fan_enabled(data, attr->index))
                 return -EINVAL;
 
@@ -1114,7 +1115,7 @@ static ssize_t set_force_pwm_max(struct device *dev,
         long temp;
         u8 reg;
 
-        if (kstrtol(buf, 10, &temp))
+        if (strict_strtol(buf, 10, &temp))
                 return -EINVAL;
 
         mutex_lock(&data->lock);
@@ -1146,7 +1147,7 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *devattr,
         struct adt7462_data *data = i2c_get_clientdata(client);
         long temp;
 
-        if (kstrtol(buf, 10, &temp))
+        if (strict_strtol(buf, 10, &temp))
                 return -EINVAL;
 
         temp = SENSORS_LIMIT(temp, 0, 255);
@@ -1176,7 +1177,7 @@ static ssize_t set_pwm_max(struct device *dev,
         struct adt7462_data *data = i2c_get_clientdata(client);
         long temp;
 
-        if (kstrtol(buf, 10, &temp))
+        if (strict_strtol(buf, 10, &temp))
                 return -EINVAL;
 
         temp = SENSORS_LIMIT(temp, 0, 255);
@@ -1208,7 +1209,7 @@ static ssize_t set_pwm_min(struct device *dev,
         struct adt7462_data *data = i2c_get_clientdata(client);
         long temp;
 
-        if (kstrtol(buf, 10, &temp))
+        if (strict_strtol(buf, 10, &temp))
                 return -EINVAL;
 
         temp = SENSORS_LIMIT(temp, 0, 255);
@@ -1242,7 +1243,7 @@ static ssize_t set_pwm_hyst(struct device *dev,
         struct adt7462_data *data = i2c_get_clientdata(client);
         long temp;
 
-        if (kstrtol(buf, 10, &temp))
+        if (strict_strtol(buf, 10, &temp))
                 return -EINVAL;
 
         temp = DIV_ROUND_CLOSEST(temp, 1000);
@@ -1288,7 +1289,7 @@ static ssize_t set_pwm_tmax(struct device *dev,
         int tmin, trange_value;
         long trange;
 
-        if (kstrtol(buf, 10, &trange))
+        if (strict_strtol(buf, 10, &trange))
                 return -EINVAL;
 
         /* trange = tmax - tmin */
@@ -1329,7 +1330,7 @@ static ssize_t set_pwm_tmin(struct device *dev,
         struct adt7462_data *data = i2c_get_clientdata(client);
         long temp;
 
-        if (kstrtol(buf, 10, &temp))
+        if (strict_strtol(buf, 10, &temp))
                 return -EINVAL;
 
         temp = DIV_ROUND_CLOSEST(temp, 1000) + 64;
@@ -1386,7 +1387,7 @@ static ssize_t set_pwm_auto(struct device *dev,
         struct adt7462_data *data = i2c_get_clientdata(client);
         long temp;
 
-        if (kstrtol(buf, 10, &temp))
+        if (strict_strtol(buf, 10, &temp))
                 return -EINVAL;
 
         switch (temp) {
@@ -1445,7 +1446,7 @@ static ssize_t set_pwm_auto_temp(struct device *dev,
         struct adt7462_data *data = i2c_get_clientdata(client);
         long temp;
 
-        if (kstrtol(buf, 10, &temp))
+        if (strict_strtol(buf, 10, &temp))
                 return -EINVAL;
 
         temp = cvt_auto_temp(temp);
@@ -1726,7 +1727,8 @@ static SENSOR_DEVICE_ATTR(pwm3_auto_channels_temp, S_IWUSR | S_IRUGO,
 static SENSOR_DEVICE_ATTR(pwm4_auto_channels_temp, S_IWUSR | S_IRUGO,
                     show_pwm_auto_temp, set_pwm_auto_temp, 3);
 
-static struct attribute *adt7462_attr[] = {
+static struct attribute *adt7462_attr[] =
+{
         &sensor_dev_attr_temp1_max.dev_attr.attr,
         &sensor_dev_attr_temp2_max.dev_attr.attr,
         &sensor_dev_attr_temp3_max.dev_attr.attr,
@@ -1930,10 +1932,11 @@ static int adt7462_probe(struct i2c_client *client,
         struct adt7462_data *data;
         int err;
 
-        data = devm_kzalloc(&client->dev, sizeof(struct adt7462_data),
-                            GFP_KERNEL);
-        if (!data)
-                return -ENOMEM;
+        data = kzalloc(sizeof(struct adt7462_data), GFP_KERNEL);
+        if (!data) {
+                err = -ENOMEM;
+                goto exit;
+        }
 
         i2c_set_clientdata(client, data);
         mutex_init(&data->lock);
@@ -1944,7 +1947,7 @@ static int adt7462_probe(struct i2c_client *client,
         data->attrs.attrs = adt7462_attr;
         err = sysfs_create_group(&client->dev.kobj, &data->attrs);
         if (err)
-                return err;
+                goto exit_free;
 
         data->hwmon_dev = hwmon_device_register(&client->dev);
         if (IS_ERR(data->hwmon_dev)) {
@@ -1956,6 +1959,9 @@ static int adt7462_probe(struct i2c_client *client,
 
 exit_remove:
         sysfs_remove_group(&client->dev.kobj, &data->attrs);
+exit_free:
+        kfree(data);
+exit:
         return err;
 }
 
@@ -1965,11 +1971,23 @@ static int adt7462_remove(struct i2c_client *client)
 
         hwmon_device_unregister(data->hwmon_dev);
         sysfs_remove_group(&client->dev.kobj, &data->attrs);
+        kfree(data);
         return 0;
 }
 
-module_i2c_driver(adt7462_driver);
+static int __init adt7462_init(void)
+{
+        return i2c_add_driver(&adt7462_driver);
+}
+
+static void __exit adt7462_exit(void)
+{
+        i2c_del_driver(&adt7462_driver);
+}
 
 MODULE_AUTHOR("Darrick J. Wong <djwong@us.ibm.com>");
 MODULE_DESCRIPTION("ADT7462 driver");
 MODULE_LICENSE("GPL");
+
+module_init(adt7462_init);
+module_exit(adt7462_exit);