linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/drivers/hwmon/via686a.c b/drivers/hwmon/via686a.c
index 166298f..cb01848 100644 (file)
--- a/drivers/hwmon/via686a.c
+++ b/drivers/hwmon/via686a.c
@@ -39,7 +39,6 @@
 #include <linux/hwmon.h>
 #include <linux/err.h>
 #include <linux/init.h>
-#include <linux/mutex.h>
 #include <asm/io.h>
 
 
@@ -297,7 +296,7 @@ static inline long TEMP_FROM_REG10(u16 val)
 struct via686a_data {
        struct i2c_client client;
        struct class_device *class_dev;
-       struct mutex update_lock;
+       struct semaphore update_lock;
        char valid;             /* !=0 if following fields are valid */
        unsigned long last_updated;     /* In jiffies */
 
@@ -356,11 +355,11 @@ static ssize_t set_in_min(struct device *dev, const char *buf,
        struct via686a_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] = IN_TO_REG(val, nr);
        via686a_write_value(client, VIA686A_REG_IN_MIN(nr),
                        data->in_min[nr]);
-       mutex_unlock(&data->update_lock);
+       up(&data->update_lock);
        return count;
 }
 static ssize_t set_in_max(struct device *dev, const char *buf,
@@ -369,11 +368,11 @@ static ssize_t set_in_max(struct device *dev, const char *buf,
        struct via686a_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] = IN_TO_REG(val, nr);
        via686a_write_value(client, VIA686A_REG_IN_MAX(nr),
                        data->in_max[nr]);
-       mutex_unlock(&data->update_lock);
+       up(&data->update_lock);
        return count;
 }
 #define show_in_offset(offset)                                 \
@@ -433,11 +432,11 @@ static ssize_t set_temp_over(struct device *dev, const char *buf,
        struct via686a_data *data = i2c_get_clientdata(client);
        int val = simple_strtol(buf, NULL, 10);
 
-       mutex_lock(&data->update_lock);
+       down(&data->update_lock);
        data->temp_over[nr] = TEMP_TO_REG(val);
        via686a_write_value(client, VIA686A_REG_TEMP_OVER[nr],
                            data->temp_over[nr]);
-       mutex_unlock(&data->update_lock);
+       up(&data->update_lock);
        return count;
 }
 static ssize_t set_temp_hyst(struct device *dev, const char *buf,
@@ -446,11 +445,11 @@ static ssize_t set_temp_hyst(struct device *dev, const char *buf,
        struct via686a_data *data = i2c_get_clientdata(client);
        int val = simple_strtol(buf, NULL, 10);
 
-       mutex_lock(&data->update_lock);
+       down(&data->update_lock);
        data->temp_hyst[nr] = TEMP_TO_REG(val);
        via686a_write_value(client, VIA686A_REG_TEMP_HYST[nr],
                            data->temp_hyst[nr]);
-       mutex_unlock(&data->update_lock);
+       up(&data->update_lock);
        return count;
 }
 #define show_temp_offset(offset)                                       \
@@ -509,10 +508,10 @@ static ssize_t set_fan_min(struct device *dev, const char *buf,
        struct via686a_data *data = i2c_get_clientdata(client);
        int val = simple_strtol(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]));
        via686a_write_value(client, VIA686A_REG_FAN_MIN(nr+1), data->fan_min[nr]);
-       mutex_unlock(&data->update_lock);
+       up(&data->update_lock);
        return count;
 }
 static ssize_t set_fan_div(struct device *dev, const char *buf,
@@ -522,12 +521,12 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
        int val = simple_strtol(buf, NULL, 10);
        int old;
 
-       mutex_lock(&data->update_lock);
+       down(&data->update_lock);
        old = via686a_read_value(client, VIA686A_REG_FANDIV);
        data->fan_div[nr] = DIV_TO_REG(val);
        old = (old & 0x0f) | (data->fan_div[1] << 6) | (data->fan_div[0] << 4);
        via686a_write_value(client, VIA686A_REG_FANDIV, old);
-       mutex_unlock(&data->update_lock);
+       up(&data->update_lock);
        return count;
 }
 
@@ -640,7 +639,7 @@ static int via686a_detect(struct i2c_adapter *adapter)
        strlcpy(new_client->name, client_name, I2C_NAME_SIZE);
 
        data->valid = 0;
-       mutex_init(&data->update_lock);
+       init_MUTEX(&data->update_lock);
        /* Tell the I2C layer a new client has arrived */
        if ((err = i2c_attach_client(new_client)))
                goto exit_free;
@@ -734,7 +733,7 @@ static struct via686a_data *via686a_update_device(struct device *dev)
        struct via686a_data *data = i2c_get_clientdata(client);
        int i;
 
-       mutex_lock(&data->update_lock);
+       down(&data->update_lock);
 
        if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
            || !data->valid) {
@@ -789,7 +788,7 @@ static struct via686a_data *via686a_update_device(struct device *dev)
                data->valid = 1;
        }
 
-       mutex_unlock(&data->update_lock);
+       up(&data->update_lock);
 
        return data;
 }