linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / hwmon / vt8231.c

diff --git a/drivers/hwmon/vt8231.c b/drivers/hwmon/vt8231.c
index 686f3de..271e9cb 100644 (file)
--- a/drivers/hwmon/vt8231.c
+++ b/drivers/hwmon/vt8231.c
@@ -35,7 +35,6 @@
 #include <linux/hwmon-sysfs.h>
 #include <linux/hwmon-vid.h>
 #include <linux/err.h>
-#include <linux/mutex.h>
 #include <asm/io.h>
 
 static int force_addr;
@@ -149,7 +148,7 @@ static inline u8 FAN_TO_REG(long rpm, int div)
 
 struct vt8231_data {
        struct i2c_client client;
-       struct mutex update_lock;
+       struct semaphore update_lock;
        struct class_device *class_dev;
        char valid;             /* !=0 if following fields are valid */
        unsigned long last_updated;     /* In jiffies */
@@ -224,10 +223,10 @@ static ssize_t set_in_min(struct device *dev, struct device_attribute *attr,
        struct vt8231_data *data = i2c_get_clientdata(client);
        unsigned long val = simple_strtoul(buf, NULL, 10);
 
-       mutex_lock(&data->update_lock);
+       down(&data->update_lock);
        data->in_min[nr] = SENSORS_LIMIT(((val * 958) / 10000) + 3, 0, 255);
        vt8231_write_value(client, regvoltmin[nr], data->in_min[nr]);
-       mutex_unlock(&data->update_lock);
+       up(&data->update_lock);
        return count;
 }
 
@@ -240,10 +239,10 @@ static ssize_t set_in_max(struct device *dev, struct device_attribute *attr,
        struct vt8231_data *data = i2c_get_clientdata(client);
        unsigned long val = simple_strtoul(buf, NULL, 10);
 
-       mutex_lock(&data->update_lock);
+       down(&data->update_lock);
        data->in_max[nr] = SENSORS_LIMIT(((val * 958) / 10000) + 3, 0, 255);
        vt8231_write_value(client, regvoltmax[nr], data->in_max[nr]);
-       mutex_unlock(&data->update_lock);
+       up(&data->update_lock);
        return count;
 }
 
@@ -282,11 +281,11 @@ static ssize_t set_in5_min(struct device *dev, struct device_attribute *attr,
        struct vt8231_data *data = i2c_get_clientdata(client);
        unsigned long val = simple_strtoul(buf, NULL, 10);
 
-       mutex_lock(&data->update_lock);
+       down(&data->update_lock);
        data->in_min[5] = SENSORS_LIMIT(((val * 958 * 34) / (10000 * 54)) + 3,
                                        0, 255);
        vt8231_write_value(client, regvoltmin[5], data->in_min[5]);
-       mutex_unlock(&data->update_lock);
+       up(&data->update_lock);
        return count;
 }
 
@@ -297,11 +296,11 @@ static ssize_t set_in5_max(struct device *dev, struct device_attribute *attr,
        struct vt8231_data *data = i2c_get_clientdata(client);
        unsigned long val = simple_strtoul(buf, NULL, 10);
 
-       mutex_lock(&data->update_lock);
+       down(&data->update_lock);
        data->in_max[5] = SENSORS_LIMIT(((val * 958 * 34) / (10000 * 54)) + 3,
                                        0, 255);
        vt8231_write_value(client, regvoltmax[5], data->in_max[5]);
-       mutex_unlock(&data->update_lock);
+       up(&data->update_lock);
        return count;
 }
 
@@ -352,10 +351,10 @@ static ssize_t set_temp0_max(struct device *dev, struct device_attribute *attr,
        struct vt8231_data *data = i2c_get_clientdata(client);
        int val = simple_strtol(buf, NULL, 10);
 
-       mutex_lock(&data->update_lock);
+       down(&data->update_lock);
        data->temp_max[0] = SENSORS_LIMIT((val + 500) / 1000, 0, 255);
        vt8231_write_value(client, regtempmax[0], data->temp_max[0]);
-       mutex_unlock(&data->update_lock);
+       up(&data->update_lock);
        return count;
 }
 static ssize_t set_temp0_min(struct device *dev, struct device_attribute *attr,
@@ -365,10 +364,10 @@ static ssize_t set_temp0_min(struct device *dev, struct device_attribute *attr,
        struct vt8231_data *data = i2c_get_clientdata(client);
        int val = simple_strtol(buf, NULL, 10);
 
-       mutex_lock(&data->update_lock);
+       down(&data->update_lock);
        data->temp_min[0] = SENSORS_LIMIT((val + 500) / 1000, 0, 255);
        vt8231_write_value(client, regtempmin[0], data->temp_min[0]);
-       mutex_unlock(&data->update_lock);
+       up(&data->update_lock);
        return count;
 }
 
@@ -408,10 +407,10 @@ static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,
        struct vt8231_data *data = i2c_get_clientdata(client);
        int val = simple_strtol(buf, NULL, 10);
 
-       mutex_lock(&data->update_lock);
+       down(&data->update_lock);
        data->temp_max[nr] = SENSORS_LIMIT(TEMP_MAXMIN_TO_REG(val), 0, 255);
        vt8231_write_value(client, regtempmax[nr], data->temp_max[nr]);
-       mutex_unlock(&data->update_lock);
+       up(&data->update_lock);
        return count;
 }
 static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,
@@ -423,10 +422,10 @@ static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,
        struct vt8231_data *data = i2c_get_clientdata(client);
        int val = simple_strtol(buf, NULL, 10);
 
-       mutex_lock(&data->update_lock);
+       down(&data->update_lock);
        data->temp_min[nr] = SENSORS_LIMIT(TEMP_MAXMIN_TO_REG(val), 0, 255);
        vt8231_write_value(client, regtempmin[nr], data->temp_min[nr]);
-       mutex_unlock(&data->update_lock);
+       up(&data->update_lock);
        return count;
 }
 
@@ -521,10 +520,10 @@ static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr,
        struct vt8231_data *data = i2c_get_clientdata(client);
        int val = simple_strtoul(buf, NULL, 10);
 
-       mutex_lock(&data->update_lock);
+       down(&data->update_lock);
        data->fan_min[nr] = FAN_TO_REG(val, DIV_FROM_REG(data->fan_div[nr]));
        vt8231_write_value(client, VT8231_REG_FAN_MIN(nr), data->fan_min[nr]);
-       mutex_unlock(&data->update_lock);
+       up(&data->update_lock);
        return count;
 }
 
@@ -540,7 +539,7 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,
        long min = FAN_FROM_REG(data->fan_min[nr],
                                 DIV_FROM_REG(data->fan_div[nr]));
 
-       mutex_lock(&data->update_lock);
+       down(&data->update_lock);
        switch (val) {
        case 1: data->fan_div[nr] = 0; break;
        case 2: data->fan_div[nr] = 1; break;
@@ -549,7 +548,7 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,
        default:
                dev_err(&client->dev, "fan_div value %ld not supported."
                        "Choose one of 1, 2, 4 or 8!\n", val);
-               mutex_unlock(&data->update_lock);
+               up(&data->update_lock);
                return -EINVAL;
        }
 
@@ -559,7 +558,7 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,
 
        old = (old & 0x0f) | (data->fan_div[1] << 6) | (data->fan_div[0] << 4);
        vt8231_write_value(client, VT8231_REG_FANDIV, old);
-       mutex_unlock(&data->update_lock);
+       up(&data->update_lock);
        return count;
 }
 
@@ -661,7 +660,7 @@ int vt8231_detect(struct i2c_adapter *adapter)
        /* Fill in the remaining client fields and put into the global list */
        strlcpy(client->name, "vt8231", I2C_NAME_SIZE);
 
-       mutex_init(&data->update_lock);
+       init_MUTEX(&data->update_lock);
 
        /* Tell the I2C layer a new client has arrived */
        if ((err = i2c_attach_client(client)))
@@ -746,7 +745,7 @@ static struct vt8231_data *vt8231_update_device(struct device *dev)
        int i;
        u16 low;
 
-       mutex_lock(&data->update_lock);
+       down(&data->update_lock);
 
        if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
            || !data->valid) {
@@ -805,7 +804,7 @@ static struct vt8231_data *vt8231_update_device(struct device *dev)
                data->valid = 1;
        }
 
-       mutex_unlock(&data->update_lock);
+       up(&data->update_lock);
 
        return data;
 }