Merge branch 'drm-forlinus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[pandora-kernel.git] / drivers / hwmon / w83l785ts.c

diff --git a/drivers/hwmon/w83l785ts.c b/drivers/hwmon/w83l785ts.c
index 133e34a..f66c0cf 100644 (file)
--- a/drivers/hwmon/w83l785ts.c
+++ b/drivers/hwmon/w83l785ts.c
@@ -37,6 +37,7 @@
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
 #include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
 #include <linux/err.h>
 
 /* How many retries on register read error */
@@ -73,7 +74,7 @@ I2C_CLIENT_INSMOD_1(w83l785ts);
  * The W83L785TS-S uses signed 8-bit values.
  */
 
-#define TEMP_FROM_REG(val)     ((val & 0x80 ? val-0x100 : val) * 1000)
+#define TEMP_FROM_REG(val)     ((val) * 1000)
 
 /*
  * Functions declaration
@@ -91,10 +92,10 @@ static struct w83l785ts_data *w83l785ts_update_device(struct device *dev);
  */
  
 static struct i2c_driver w83l785ts_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "w83l785ts",
+       .driver = {
+               .name   = "w83l785ts",
+       },
        .id             = I2C_DRIVERID_W83L785TS,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = w83l785ts_attach_adapter,
        .detach_client  = w83l785ts_detach_client,
 };
@@ -111,27 +112,24 @@ struct w83l785ts_data {
        unsigned long last_updated; /* in jiffies */
 
        /* registers values */
-       u8 temp, temp_over;
+       s8 temp[2]; /* 0: input
+                      1: critical limit */
 };
 
 /*
  * Sysfs stuff
  */
 
-static ssize_t show_temp(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_temp(struct device *dev, struct device_attribute *devattr,
+       char *buf)
 {
+       struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
        struct w83l785ts_data *data = w83l785ts_update_device(dev);
-       return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp));
+       return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[attr->index]));
 }
 
-static ssize_t show_temp_over(struct device *dev, struct device_attribute *attr, char *buf)
-{
-       struct w83l785ts_data *data = w83l785ts_update_device(dev);
-       return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_over));
-}
-
-static DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL);
-static DEVICE_ATTR(temp1_max, S_IRUGO, show_temp_over, NULL);
+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp1_max, S_IRUGO, show_temp, NULL, 1);
 
 /*
  * Real code
@@ -158,12 +156,10 @@ static int w83l785ts_detect(struct i2c_adapter *adapter, int address, int kind)
        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                goto exit;
 
-       if (!(data = kmalloc(sizeof(struct w83l785ts_data), GFP_KERNEL))) {
+       if (!(data = kzalloc(sizeof(struct w83l785ts_data), GFP_KERNEL))) {
                err = -ENOMEM;
                goto exit;
        }
-       memset(data, 0, sizeof(struct w83l785ts_data));
-
 
        /* The common I2C client data is placed right before the
         * W83L785TS-specific data. */
@@ -228,7 +224,7 @@ static int w83l785ts_detect(struct i2c_adapter *adapter, int address, int kind)
        init_MUTEX(&data->update_lock);
 
        /* Default values in case the first read fails (unlikely). */
-       data->temp_over = data->temp = 0;
+       data->temp[1] = data->temp[0] = 0;
 
        /* Tell the I2C layer a new client has arrived. */
        if ((err = i2c_attach_client(new_client))) 
@@ -246,8 +242,10 @@ static int w83l785ts_detect(struct i2c_adapter *adapter, int address, int kind)
                goto exit_detach;
        }
 
-       device_create_file(&new_client->dev, &dev_attr_temp1_input);
-       device_create_file(&new_client->dev, &dev_attr_temp1_max);
+       device_create_file(&new_client->dev,
+                          &sensor_dev_attr_temp1_input.dev_attr);
+       device_create_file(&new_client->dev,
+                          &sensor_dev_attr_temp1_max.dev_attr);
 
        return 0;
 
@@ -305,10 +303,10 @@ static struct w83l785ts_data *w83l785ts_update_device(struct device *dev)
 
        if (!data->valid || time_after(jiffies, data->last_updated + HZ * 2)) {
                dev_dbg(&client->dev, "Updating w83l785ts data.\n");
-               data->temp = w83l785ts_read_value(client,
-                            W83L785TS_REG_TEMP, data->temp);
-               data->temp_over = w83l785ts_read_value(client,
-                                 W83L785TS_REG_TEMP_OVER, data->temp_over);
+               data->temp[0] = w83l785ts_read_value(client,
+                               W83L785TS_REG_TEMP, data->temp[0]);
+               data->temp[1] = w83l785ts_read_value(client,
+                               W83L785TS_REG_TEMP_OVER, data->temp[1]);
 
                data->last_updated = jiffies;
                data->valid = 1;