Patched in Tegra support.

1 files changed, 41 insertions, 34 deletions

diff --git a/drivers/hwmon/max6639.c b/drivers/hwmon/max6639.c
index 6e60036abfa..f20d9978ee7 100644
--- a/drivers/hwmon/max6639.c
+++ b/drivers/hwmon/max6639.c
@@ -72,8 +72,8 @@ static unsigned short normal_i2c[] = { 0x2c, 0x2e, 0x2f, I2C_CLIENT_END };
 
 static const int rpm_ranges[] = { 2000, 4000, 8000, 16000 };
 
-#define FAN_FROM_REG(val, rpm_range)    ((val) == 0 || (val) == 255 ? \
-                                0 : (rpm_ranges[rpm_range] * 30) / (val))
+#define FAN_FROM_REG(val, div, rpm_range)       ((val) == 0 ? -1 : \
+        (val) == 255 ? 0 : (rpm_ranges[rpm_range] * 30) / ((div + 1) * (val)))
 #define TEMP_LIMIT_TO_REG(val)  SENSORS_LIMIT((val) / 1000, 0, 255)
 
 /*
@@ -208,7 +208,7 @@ static ssize_t set_temp_max(struct device *dev,
         unsigned long val;
         int res;
 
-        res = kstrtoul(buf, 10, &val);
+        res = strict_strtoul(buf, 10, &val);
         if (res)
                 return res;
 
@@ -241,7 +241,7 @@ static ssize_t set_temp_crit(struct device *dev,
         unsigned long val;
         int res;
 
-        res = kstrtoul(buf, 10, &val);
+        res = strict_strtoul(buf, 10, &val);
         if (res)
                 return res;
 
@@ -275,7 +275,7 @@ static ssize_t set_temp_emergency(struct device *dev,
         unsigned long val;
         int res;
 
-        res = kstrtoul(buf, 10, &val);
+        res = strict_strtoul(buf, 10, &val);
         if (res)
                 return res;
 
@@ -308,7 +308,7 @@ static ssize_t set_pwm(struct device *dev,
         unsigned long val;
         int res;
 
-        res = kstrtoul(buf, 10, &val);
+        res = strict_strtoul(buf, 10, &val);
         if (res)
                 return res;
 
@@ -333,7 +333,7 @@ static ssize_t show_fan_input(struct device *dev,
                 return PTR_ERR(data);
 
         return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan[attr->index],
-                       data->rpm_range));
+                       data->ppr, data->rpm_range));
 }
 
 static ssize_t show_alarm(struct device *dev,
@@ -429,9 +429,9 @@ static int max6639_init_client(struct i2c_client *client)
         struct max6639_data *data = i2c_get_clientdata(client);
         struct max6639_platform_data *max6639_info =
                 client->dev.platform_data;
-        int i;
+        int i = 0;
         int rpm_range = 1; /* default: 4000 RPM */
-        int err;
+        int err = 0;
 
         /* Reset chip to default values, see below for GCONFIG setup */
         err = i2c_smbus_write_byte_data(client, MAX6639_REG_GCONFIG,
@@ -446,6 +446,11 @@ static int max6639_init_client(struct i2c_client *client)
         else
                 data->ppr = 2;
         data->ppr -= 1;
+        err = i2c_smbus_write_byte_data(client,
+                        MAX6639_REG_FAN_PPR(i),
+                        data->ppr << 5);
+        if (err)
+                goto exit;
 
         if (max6639_info)
                 rpm_range = rpm_range_to_reg(max6639_info->rpm_range);
@@ -453,13 +458,6 @@ static int max6639_init_client(struct i2c_client *client)
 
         for (i = 0; i < 2; i++) {
 
-                /* Set Fan pulse per revolution */
-                err = i2c_smbus_write_byte_data(client,
-                                MAX6639_REG_FAN_PPR(i),
-                                data->ppr << 6);
-                if (err)
-                        goto exit;
-
                 /* Fans config PWM, RPM */
                 err = i2c_smbus_write_byte_data(client,
                         MAX6639_REG_FAN_CONFIG1(i),
@@ -548,10 +546,11 @@ static int max6639_probe(struct i2c_client *client,
         struct max6639_data *data;
         int err;
 
-        data = devm_kzalloc(&client->dev, sizeof(struct max6639_data),
-                            GFP_KERNEL);
-        if (!data)
-                return -ENOMEM;
+        data = kzalloc(sizeof(struct max6639_data), GFP_KERNEL);
+        if (!data) {
+                err = -ENOMEM;
+                goto exit;
+        }
 
         i2c_set_clientdata(client, data);
         mutex_init(&data->update_lock);
@@ -559,12 +558,12 @@ static int max6639_probe(struct i2c_client *client,
         /* Initialize the max6639 chip */
         err = max6639_init_client(client);
         if (err < 0)
-                return err;
+                goto error_free;
 
         /* Register sysfs hooks */
         err = sysfs_create_group(&client->dev.kobj, &max6639_group);
         if (err)
-                return err;
+                goto error_free;
 
         data->hwmon_dev = hwmon_device_register(&client->dev);
         if (IS_ERR(data->hwmon_dev)) {
@@ -578,6 +577,9 @@ static int max6639_probe(struct i2c_client *client,
 
 error_remove:
         sysfs_remove_group(&client->dev.kobj, &max6639_group);
+error_free:
+        kfree(data);
+exit:
         return err;
 }
 
@@ -588,13 +590,12 @@ static int max6639_remove(struct i2c_client *client)
         hwmon_device_unregister(data->hwmon_dev);
         sysfs_remove_group(&client->dev.kobj, &max6639_group);
 
+        kfree(data);
         return 0;
 }
 
-#ifdef CONFIG_PM_SLEEP
-static int max6639_suspend(struct device *dev)
+static int max6639_suspend(struct i2c_client *client, pm_message_t mesg)
 {
-        struct i2c_client *client = to_i2c_client(dev);
         int data = i2c_smbus_read_byte_data(client, MAX6639_REG_GCONFIG);
         if (data < 0)
                 return data;
@@ -603,9 +604,8 @@ static int max6639_suspend(struct device *dev)
                         MAX6639_REG_GCONFIG, data | MAX6639_GCONFIG_STANDBY);
 }
 
-static int max6639_resume(struct device *dev)
+static int max6639_resume(struct i2c_client *client)
 {
-        struct i2c_client *client = to_i2c_client(dev);
         int data = i2c_smbus_read_byte_data(client, MAX6639_REG_GCONFIG);
         if (data < 0)
                 return data;
@@ -613,7 +613,6 @@ static int max6639_resume(struct device *dev)
         return i2c_smbus_write_byte_data(client,
                         MAX6639_REG_GCONFIG, data & ~MAX6639_GCONFIG_STANDBY);
 }
-#endif /* CONFIG_PM_SLEEP */
 
 static const struct i2c_device_id max6639_id[] = {
         {"max6639", 0},
@@ -622,25 +621,33 @@ static const struct i2c_device_id max6639_id[] = {
 
 MODULE_DEVICE_TABLE(i2c, max6639_id);
 
-static const struct dev_pm_ops max6639_pm_ops = {
-        SET_SYSTEM_SLEEP_PM_OPS(max6639_suspend, max6639_resume)
-};
-
 static struct i2c_driver max6639_driver = {
         .class = I2C_CLASS_HWMON,
         .driver = {
                    .name = "max6639",
-                   .pm = &max6639_pm_ops,
                    },
         .probe = max6639_probe,
         .remove = max6639_remove,
+        .suspend = max6639_suspend,
+        .resume = max6639_resume,
         .id_table = max6639_id,
         .detect = max6639_detect,
         .address_list = normal_i2c,
 };
 
-module_i2c_driver(max6639_driver);
+static int __init max6639_init(void)
+{
+        return i2c_add_driver(&max6639_driver);
+}
+
+static void __exit max6639_exit(void)
+{
+        i2c_del_driver(&max6639_driver);
+}
 
 MODULE_AUTHOR("Roland Stigge <stigge@antcom.de>");
 MODULE_DESCRIPTION("max6639 driver");
 MODULE_LICENSE("GPL");
+
+module_init(max6639_init);
+module_exit(max6639_exit);