1 files changed, 28 insertions, 27 deletions

diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c
index 64c1f8af5bb2..782117817526 100644
--- a/drivers/hwmon/w83781d.c
+++ b/drivers/hwmon/w83781d.c
@@ -42,6 +42,7 @@
 #include <linux/hwmon.h>
 #include <linux/hwmon-vid.h>
 #include <linux/err.h>
+#include <linux/mutex.h>
 #include <asm/io.h>
 #include "lm75.h"
 
@@ -226,10 +227,10 @@ DIV_TO_REG(long val, enum chips type)
 struct w83781d_data {
         struct i2c_client client;
         struct class_device *class_dev;
-        struct semaphore lock;
+        struct mutex lock;
         enum chips type;
 
-        struct semaphore update_lock;
+        struct mutex update_lock;
         char valid;             /* !=0 if following fields are valid */
         unsigned long last_updated;     /* In jiffies */
 
@@ -311,11 +312,11 @@ static ssize_t store_in_##reg (struct device *dev, const char *buf, size_t count
          \
         val = simple_strtoul(buf, NULL, 10) / 10; \
          \
-        down(&data->update_lock); \
+        mutex_lock(&data->update_lock); \
         data->in_##reg[nr] = IN_TO_REG(val); \
         w83781d_write_value(client, W83781D_REG_IN_##REG(nr), data->in_##reg[nr]); \
          \
-        up(&data->update_lock); \
+        mutex_unlock(&data->update_lock); \
         return count; \
 }
 store_in_reg(MIN, min);
@@ -381,13 +382,13 @@ store_fan_min(struct device *dev, const char *buf, size_t count, int nr)
 
         val = simple_strtoul(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->fan_min[nr - 1] =
             FAN_TO_REG(val, DIV_FROM_REG(data->fan_div[nr - 1]));
         w83781d_write_value(client, W83781D_REG_FAN_MIN(nr),
                             data->fan_min[nr - 1]);
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -446,7 +447,7 @@ static ssize_t store_temp_##reg (struct device *dev, const char *buf, size_t cou
          \
         val = simple_strtol(buf, NULL, 10); \
          \
-        down(&data->update_lock); \
+        mutex_lock(&data->update_lock); \
          \
         if (nr >= 2) {  /* TEMP2 and TEMP3 */ \
                 data->temp_##reg##_add[nr-2] = LM75_TEMP_TO_REG(val); \
@@ -458,7 +459,7 @@ static ssize_t store_temp_##reg (struct device *dev, const char *buf, size_t cou
                         data->temp_##reg); \
         } \
          \
-        up(&data->update_lock); \
+        mutex_unlock(&data->update_lock); \
         return count; \
 }
 store_temp_reg(OVER, max);
@@ -571,7 +572,7 @@ store_beep_reg(struct device *dev, const char *buf, size_t count,
 
         val = simple_strtoul(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         if (update_mask == BEEP_MASK) { /* We are storing beep_mask */
                 data->beep_mask = BEEP_MASK_TO_REG(val, data->type);
@@ -592,7 +593,7 @@ store_beep_reg(struct device *dev, const char *buf, size_t count,
         w83781d_write_value(client, W83781D_REG_BEEP_INTS2,
                             val2 | data->beep_enable << 7);
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -637,7 +638,7 @@ store_fan_div_reg(struct device *dev, const char *buf, size_t count, int nr)
         u8 reg;
         unsigned long val = simple_strtoul(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         
         /* Save fan_min */
         min = FAN_FROM_REG(data->fan_min[nr],
@@ -662,7 +663,7 @@ store_fan_div_reg(struct device *dev, const char *buf, size_t count, int nr)
         data->fan_min[nr] = FAN_TO_REG(min, DIV_FROM_REG(data->fan_div[nr]));
         w83781d_write_value(client, W83781D_REG_FAN_MIN(nr+1), data->fan_min[nr]);
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -709,10 +710,10 @@ store_pwm_reg(struct device *dev, const char *buf, size_t count, int nr)
 
         val = simple_strtoul(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->pwm[nr - 1] = PWM_TO_REG(val);
         w83781d_write_value(client, W83781D_REG_PWM(nr), data->pwm[nr - 1]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -725,7 +726,7 @@ store_pwmenable_reg(struct device *dev, const char *buf, size_t count, int nr)
 
         val = simple_strtoul(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         switch (val) {
         case 0:
@@ -742,11 +743,11 @@ store_pwmenable_reg(struct device *dev, const char *buf, size_t count, int nr)
                 break;
 
         default:
-                up(&data->update_lock);
+                mutex_unlock(&data->update_lock);
                 return -EINVAL;
         }
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -808,7 +809,7 @@ store_sensor_reg(struct device *dev, const char *buf, size_t count, int nr)
 
         val = simple_strtoul(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         switch (val) {
         case 1:         /* PII/Celeron diode */
@@ -841,7 +842,7 @@ store_sensor_reg(struct device *dev, const char *buf, size_t count, int nr)
                 break;
         }
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -1073,7 +1074,7 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
         new_client = &data->client;
         i2c_set_clientdata(new_client, data);
         new_client->addr = address;
-        init_MUTEX(&data->lock);
+        mutex_init(&data->lock);
         new_client->adapter = adapter;
         new_client->driver = is_isa ? &w83781d_isa_driver : &w83781d_driver;
         new_client->flags = 0;
@@ -1178,7 +1179,7 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
         data->type = kind;
 
         data->valid = 0;
-        init_MUTEX(&data->update_lock);
+        mutex_init(&data->update_lock);
 
         /* Tell the I2C layer a new client has arrived */
         if ((err = i2c_attach_client(new_client)))
@@ -1325,7 +1326,7 @@ w83781d_read_value(struct i2c_client *client, u16 reg)
         int res, word_sized, bank;
         struct i2c_client *cl;
 
-        down(&data->lock);
+        mutex_lock(&data->lock);
         if (i2c_is_isa_client(client)) {
                 word_sized = (((reg & 0xff00) == 0x100)
                               || ((reg & 0xff00) == 0x200))
@@ -1383,7 +1384,7 @@ w83781d_read_value(struct i2c_client *client, u16 reg)
                 if (bank > 2)
                         i2c_smbus_write_byte_data(client, W83781D_REG_BANK, 0);
         }
-        up(&data->lock);
+        mutex_unlock(&data->lock);
         return res;
 }
 
@@ -1394,7 +1395,7 @@ w83781d_write_value(struct i2c_client *client, u16 reg, u16 value)
         int word_sized, bank;
         struct i2c_client *cl;
 
-        down(&data->lock);
+        mutex_lock(&data->lock);
         if (i2c_is_isa_client(client)) {
                 word_sized = (((reg & 0xff00) == 0x100)
                               || ((reg & 0xff00) == 0x200))
@@ -1447,7 +1448,7 @@ w83781d_write_value(struct i2c_client *client, u16 reg, u16 value)
                 if (bank > 2)
                         i2c_smbus_write_byte_data(client, W83781D_REG_BANK, 0);
         }
-        up(&data->lock);
+        mutex_unlock(&data->lock);
         return 0;
 }
 
@@ -1533,7 +1534,7 @@ static struct w83781d_data *w83781d_update_device(struct device *dev)
         struct w83781d_data *data = i2c_get_clientdata(client);
         int i;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
             || !data->valid) {
@@ -1641,7 +1642,7 @@ static struct w83781d_data *w83781d_update_device(struct device *dev)
                 data->valid = 1;
         }
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return data;
 }