linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/drivers/hwmon/w83l785ts.c b/drivers/hwmon/w83l785ts.c
index 3f2bac1..f66c0cf 100644 (file)
--- a/drivers/hwmon/w83l785ts.c
+++ b/drivers/hwmon/w83l785ts.c
@@ -39,7 +39,6 @@
 #include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
 #include <linux/err.h>
-#include <linux/mutex.h>
 
 /* How many retries on register read error */
 #define MAX_RETRIES    5
@@ -108,7 +107,7 @@ static struct i2c_driver w83l785ts_driver = {
 struct w83l785ts_data {
        struct i2c_client client;
        struct class_device *class_dev;
-       struct mutex update_lock;
+       struct semaphore update_lock;
        char valid; /* zero until following fields are valid */
        unsigned long last_updated; /* in jiffies */
 
@@ -222,7 +221,7 @@ static int w83l785ts_detect(struct i2c_adapter *adapter, int address, int kind)
        /* We can fill in the remaining client fields. */
        strlcpy(new_client->name, "w83l785ts", I2C_NAME_SIZE);
        data->valid = 0;
-       mutex_init(&data->update_lock);
+       init_MUTEX(&data->update_lock);
 
        /* Default values in case the first read fails (unlikely). */
        data->temp[1] = data->temp[0] = 0;
@@ -300,7 +299,7 @@ static struct w83l785ts_data *w83l785ts_update_device(struct device *dev)
        struct i2c_client *client = to_i2c_client(dev);
        struct w83l785ts_data *data = i2c_get_clientdata(client);
 
-       mutex_lock(&data->update_lock);
+       down(&data->update_lock);
 
        if (!data->valid || time_after(jiffies, data->last_updated + HZ * 2)) {
                dev_dbg(&client->dev, "Updating w83l785ts data.\n");
@@ -313,7 +312,7 @@ static struct w83l785ts_data *w83l785ts_update_device(struct device *dev)
                data->valid = 1;
        }
 
-       mutex_unlock(&data->update_lock);
+       up(&data->update_lock);
 
        return data;
 }