vserver 2.0 rc7

[linux-2.6.git] / drivers / i2c / chips / adm1025.c

diff --git a/drivers/i2c/chips/adm1025.c b/drivers/i2c/chips/adm1025.c
index 4f41088..e0771a3 100644 (file)
--- a/drivers/i2c/chips/adm1025.c
+++ b/drivers/i2c/chips/adm1025.c
@@ -49,6 +49,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
+#include <linux/jiffies.h>
 #include <linux/i2c.h>
 #include <linux/i2c-sensor.h>
 #include <linux/i2c-vid.h>
@@ -147,12 +148,6 @@ struct adm1025_data {
        u8 vrm;
 };
 
-/*
- * Internal variables
- */
-
-static int adm1025_id;
-
 /*
  * Sysfs stuff
  */
@@ -211,9 +206,12 @@ static ssize_t set_in##offset##_min(struct device *dev, const char *buf, \
        struct i2c_client *client = to_i2c_client(dev); \
        struct adm1025_data *data = i2c_get_clientdata(client); \
        long val = simple_strtol(buf, NULL, 10); \
+ \
+       down(&data->update_lock); \
        data->in_min[offset] = IN_TO_REG(val, in_scale[offset]); \
        i2c_smbus_write_byte_data(client, ADM1025_REG_IN_MIN(offset), \
                                  data->in_min[offset]); \
+       up(&data->update_lock); \
        return count; \
 } \
 static ssize_t set_in##offset##_max(struct device *dev, const char *buf, \
@@ -222,9 +220,12 @@ static ssize_t set_in##offset##_max(struct device *dev, const char *buf, \
        struct i2c_client *client = to_i2c_client(dev); \
        struct adm1025_data *data = i2c_get_clientdata(client); \
        long val = simple_strtol(buf, NULL, 10); \
+ \
+       down(&data->update_lock); \
        data->in_max[offset] = IN_TO_REG(val, in_scale[offset]); \
        i2c_smbus_write_byte_data(client, ADM1025_REG_IN_MAX(offset), \
                                  data->in_max[offset]); \
+       up(&data->update_lock); \
        return count; \
 } \
 static DEVICE_ATTR(in##offset##_min, S_IWUSR | S_IRUGO, \
@@ -245,9 +246,12 @@ static ssize_t set_temp##offset##_min(struct device *dev, const char *buf, \
        struct i2c_client *client = to_i2c_client(dev); \
        struct adm1025_data *data = i2c_get_clientdata(client); \
        long val = simple_strtol(buf, NULL, 10); \
+ \
+       down(&data->update_lock); \
        data->temp_min[offset-1] = TEMP_TO_REG(val); \
        i2c_smbus_write_byte_data(client, ADM1025_REG_TEMP_LOW(offset-1), \
                                  data->temp_min[offset-1]); \
+       up(&data->update_lock); \
        return count; \
 } \
 static ssize_t set_temp##offset##_max(struct device *dev, const char *buf, \
@@ -256,9 +260,12 @@ static ssize_t set_temp##offset##_max(struct device *dev, const char *buf, \
        struct i2c_client *client = to_i2c_client(dev); \
        struct adm1025_data *data = i2c_get_clientdata(client); \
        long val = simple_strtol(buf, NULL, 10); \
+ \
+       down(&data->update_lock); \
        data->temp_max[offset-1] = TEMP_TO_REG(val); \
        i2c_smbus_write_byte_data(client, ADM1025_REG_TEMP_HIGH(offset-1), \
                                  data->temp_max[offset-1]); \
+       up(&data->update_lock); \
        return count; \
 } \
 static DEVICE_ATTR(temp##offset##_min, S_IWUSR | S_IRUGO, \
@@ -397,7 +404,6 @@ static int adm1025_detect(struct i2c_adapter *adapter, int address, int kind)
 
        /* We can fill in the remaining client fields */
        strlcpy(new_client->name, name, I2C_NAME_SIZE);
-       new_client->id = adm1025_id++;
        data->valid = 0;
        init_MUTEX(&data->update_lock);
 
@@ -512,9 +518,7 @@ static struct adm1025_data *adm1025_update_device(struct device *dev)
 
        down(&data->update_lock);
 
-       if ((jiffies - data->last_updated > HZ * 2) ||
-           (jiffies < data->last_updated) ||
-           !data->valid) {
+       if (time_after(jiffies, data->last_updated + HZ * 2) || !data->valid) {
                int i;
 
                dev_dbg(&client->dev, "Updating data.\n");