36 files changed, 632 insertions, 596 deletions

diff --git a/drivers/hwmon/adm1021.c b/drivers/hwmon/adm1021.c
index 665612729cb9..2b6e74dd4a82 100644
--- a/drivers/hwmon/adm1021.c
+++ b/drivers/hwmon/adm1021.c
@@ -26,6 +26,7 @@
 #include <linux/i2c.h>
 #include <linux/hwmon.h>
 #include <linux/err.h>
+#include <linux/mutex.h>
 
 
 /* Addresses to scan */
@@ -92,7 +93,7 @@ struct adm1021_data {
         struct class_device *class_dev;
         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 */
 
@@ -162,10 +163,10 @@ static ssize_t set_##value(struct device *dev, struct device_attribute *attr, co
         struct adm1021_data *data = i2c_get_clientdata(client); \
         int temp = simple_strtoul(buf, NULL, 10);               \
                                                                 \
-        down(&data->update_lock);                               \
+        mutex_lock(&data->update_lock);                         \
         data->value = TEMP_TO_REG(temp);                        \
         adm1021_write_value(client, reg, data->value);          \
-        up(&data->update_lock);                                 \
+        mutex_unlock(&data->update_lock);                       \
         return count;                                           \
 }
 set(temp_max, ADM1021_REG_TOS_W);
@@ -275,7 +276,7 @@ static int adm1021_detect(struct i2c_adapter *adapter, int address, int kind)
         strlcpy(new_client->name, type_name, I2C_NAME_SIZE);
         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)))
@@ -351,7 +352,7 @@ static struct adm1021_data *adm1021_update_device(struct device *dev)
         struct i2c_client *client = to_i2c_client(dev);
         struct adm1021_data *data = i2c_get_clientdata(client);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
             || !data->valid) {
@@ -375,7 +376,7 @@ static struct adm1021_data *adm1021_update_device(struct device *dev)
                 data->valid = 1;
         }
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return data;
 }
diff --git a/drivers/hwmon/adm1025.c b/drivers/hwmon/adm1025.c
index 9331c56d2ba6..a4c859c9fbf8 100644
--- a/drivers/hwmon/adm1025.c
+++ b/drivers/hwmon/adm1025.c
@@ -53,6 +53,7 @@
 #include <linux/hwmon.h>
 #include <linux/hwmon-vid.h>
 #include <linux/err.h>
+#include <linux/mutex.h>
 
 /*
  * Addresses to scan
@@ -133,7 +134,7 @@ static struct i2c_driver adm1025_driver = {
 struct adm1025_data {
         struct i2c_client client;
         struct class_device *class_dev;
-        struct semaphore update_lock;
+        struct mutex update_lock;
         char valid; /* zero until following fields are valid */
         unsigned long last_updated; /* in jiffies */
 
@@ -207,11 +208,11 @@ static ssize_t set_in##offset##_min(struct device *dev, struct device_attribute
         struct adm1025_data *data = i2c_get_clientdata(client); \
         long val = simple_strtol(buf, NULL, 10); \
  \
-        down(&data->update_lock); \
+        mutex_lock(&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); \
+        mutex_unlock(&data->update_lock); \
         return count; \
 } \
 static ssize_t set_in##offset##_max(struct device *dev, struct device_attribute *attr, const char *buf, \
@@ -221,11 +222,11 @@ static ssize_t set_in##offset##_max(struct device *dev, struct device_attribute
         struct adm1025_data *data = i2c_get_clientdata(client); \
         long val = simple_strtol(buf, NULL, 10); \
  \
-        down(&data->update_lock); \
+        mutex_lock(&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); \
+        mutex_unlock(&data->update_lock); \
         return count; \
 } \
 static DEVICE_ATTR(in##offset##_min, S_IWUSR | S_IRUGO, \
@@ -247,11 +248,11 @@ static ssize_t set_temp##offset##_min(struct device *dev, struct device_attribut
         struct adm1025_data *data = i2c_get_clientdata(client); \
         long val = simple_strtol(buf, NULL, 10); \
  \
-        down(&data->update_lock); \
+        mutex_lock(&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); \
+        mutex_unlock(&data->update_lock); \
         return count; \
 } \
 static ssize_t set_temp##offset##_max(struct device *dev, struct device_attribute *attr, const char *buf, \
@@ -261,11 +262,11 @@ static ssize_t set_temp##offset##_max(struct device *dev, struct device_attribut
         struct adm1025_data *data = i2c_get_clientdata(client); \
         long val = simple_strtol(buf, NULL, 10); \
  \
-        down(&data->update_lock); \
+        mutex_lock(&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); \
+        mutex_unlock(&data->update_lock); \
         return count; \
 } \
 static DEVICE_ATTR(temp##offset##_min, S_IWUSR | S_IRUGO, \
@@ -404,7 +405,7 @@ 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);
         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)))
@@ -523,7 +524,7 @@ static struct adm1025_data *adm1025_update_device(struct device *dev)
         struct i2c_client *client = to_i2c_client(dev);
         struct adm1025_data *data = i2c_get_clientdata(client);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         if (time_after(jiffies, data->last_updated + HZ * 2) || !data->valid) {
                 int i;
@@ -558,7 +559,7 @@ static struct adm1025_data *adm1025_update_device(struct device *dev)
                 data->valid = 1;
         }
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return data;
 }
diff --git a/drivers/hwmon/adm1026.c b/drivers/hwmon/adm1026.c
index fefe6e74fd02..8646ec1e9667 100644
--- a/drivers/hwmon/adm1026.c
+++ b/drivers/hwmon/adm1026.c
@@ -32,6 +32,7 @@
 #include <linux/hwmon-sysfs.h>
 #include <linux/hwmon-vid.h>
 #include <linux/err.h>
+#include <linux/mutex.h>
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
@@ -260,10 +261,10 @@ struct pwm_data {
 struct adm1026_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;
         int valid;              /* !=0 if following fields are valid */
         unsigned long last_reading;     /* In jiffies */
         unsigned long last_config;      /* In jiffies */
@@ -575,7 +576,7 @@ static struct adm1026_data *adm1026_update_device(struct device *dev)
         int i;
         long value, alarms, gpio;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         if (!data->valid
             || time_after(jiffies, data->last_reading + ADM1026_DATA_INTERVAL)) {
                 /* Things that change quickly */
@@ -710,7 +711,7 @@ static struct adm1026_data *adm1026_update_device(struct device *dev)
         dev_dbg(&client->dev, "Setting VID from GPIO11-15.\n");
         data->vid = (data->gpio >> 11) & 0x1f;
         data->valid = 1;
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return data;
 }
 
@@ -739,10 +740,10 @@ static ssize_t set_in_min(struct device *dev, struct device_attribute *attr,
         struct adm1026_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->in_min[nr] = INS_TO_REG(nr, val);
         adm1026_write_value(client, ADM1026_REG_IN_MIN[nr], data->in_min[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count; 
 }
 static ssize_t show_in_max(struct device *dev, struct device_attribute *attr,
@@ -762,10 +763,10 @@ static ssize_t set_in_max(struct device *dev, struct device_attribute *attr,
         struct adm1026_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->in_max[nr] = INS_TO_REG(nr, val);
         adm1026_write_value(client, ADM1026_REG_IN_MAX[nr], data->in_max[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -813,10 +814,10 @@ static ssize_t set_in16_min(struct device *dev, struct device_attribute *attr, c
         struct adm1026_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->in_min[16] = INS_TO_REG(16, val + NEG12_OFFSET);
         adm1026_write_value(client, ADM1026_REG_IN_MIN[16], data->in_min[16]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count; 
 }
 static ssize_t show_in16_max(struct device *dev, struct device_attribute *attr, char *buf)
@@ -831,10 +832,10 @@ static ssize_t set_in16_max(struct device *dev, struct device_attribute *attr, c
         struct adm1026_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->in_max[16] = INS_TO_REG(16, val+NEG12_OFFSET);
         adm1026_write_value(client, ADM1026_REG_IN_MAX[16], data->in_max[16]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -874,11 +875,11 @@ static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr,
         struct adm1026_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->fan_min[nr] = FAN_TO_REG(val, data->fan_div[nr]);
         adm1026_write_value(client, ADM1026_REG_FAN_MIN(nr),
                 data->fan_min[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -939,7 +940,7 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,
         if (new_div == 0) {
                 return -EINVAL;
         }
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         orig_div = data->fan_div[nr];
         data->fan_div[nr] = DIV_FROM_REG(new_div);
 
@@ -958,7 +959,7 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,
         if (data->fan_div[nr] != orig_div) {
                 fixup_fan_min(dev,nr,orig_div);
         }
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -1001,11 +1002,11 @@ static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,
         struct adm1026_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp_min[nr] = TEMP_TO_REG(val);
         adm1026_write_value(client, ADM1026_REG_TEMP_MIN[nr],
                 data->temp_min[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 static ssize_t show_temp_max(struct device *dev, struct device_attribute *attr,
@@ -1025,11 +1026,11 @@ static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,
         struct adm1026_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp_max[nr] = TEMP_TO_REG(val);
         adm1026_write_value(client, ADM1026_REG_TEMP_MAX[nr],
                 data->temp_max[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -1064,11 +1065,11 @@ static ssize_t set_temp_offset(struct device *dev,
         struct adm1026_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp_offset[nr] = TEMP_TO_REG(val);
         adm1026_write_value(client, ADM1026_REG_TEMP_OFFSET[nr],
                 data->temp_offset[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -1115,11 +1116,11 @@ static ssize_t set_temp_auto_point1_temp(struct device *dev,
         struct adm1026_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp_tmin[nr] = TEMP_TO_REG(val);
         adm1026_write_value(client, ADM1026_REG_TEMP_TMIN[nr],
                 data->temp_tmin[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -1150,11 +1151,11 @@ static ssize_t set_temp_crit_enable(struct device *dev,
         int val = simple_strtol(buf, NULL, 10);
 
         if ((val == 1) || (val==0)) {
-                down(&data->update_lock);
+                mutex_lock(&data->update_lock);
                 data->config1 = (data->config1 & ~CFG1_THERM_HOT) | (val << 4);
                 adm1026_write_value(client, ADM1026_REG_CONFIG1, 
                         data->config1);
-                up(&data->update_lock);
+                mutex_unlock(&data->update_lock);
         }
         return count;
 }
@@ -1184,11 +1185,11 @@ static ssize_t set_temp_crit(struct device *dev, struct device_attribute *attr,
         struct adm1026_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp_crit[nr] = TEMP_TO_REG(val);
         adm1026_write_value(client, ADM1026_REG_TEMP_THERM[nr],
                 data->temp_crit[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -1212,10 +1213,10 @@ static ssize_t set_analog_out_reg(struct device *dev, struct device_attribute *a
         struct adm1026_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->analog_out = DAC_TO_REG(val);
         adm1026_write_value(client, ADM1026_REG_DAC, data->analog_out);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -1267,7 +1268,7 @@ static ssize_t set_alarm_mask(struct device *dev, struct device_attribute *attr,
         int val = simple_strtol(buf, NULL, 10);
         unsigned long mask;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->alarm_mask = val & 0x7fffffff;
         mask = data->alarm_mask
                 | (data->gpio_mask & 0x10000 ? 0x80000000 : 0);
@@ -1282,7 +1283,7 @@ static ssize_t set_alarm_mask(struct device *dev, struct device_attribute *attr,
         mask >>= 8;
         adm1026_write_value(client, ADM1026_REG_MASK4,
                 mask & 0xff);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -1303,7 +1304,7 @@ static ssize_t set_gpio(struct device *dev, struct device_attribute *attr, const
         int val = simple_strtol(buf, NULL, 10);
         long   gpio;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->gpio = val & 0x1ffff;
         gpio = data->gpio;
         adm1026_write_value(client, ADM1026_REG_GPIO_STATUS_0_7,gpio & 0xff);
@@ -1311,7 +1312,7 @@ static ssize_t set_gpio(struct device *dev, struct device_attribute *attr, const
         adm1026_write_value(client, ADM1026_REG_GPIO_STATUS_8_15,gpio & 0xff);
         gpio = ((gpio >> 1) & 0x80) | (data->alarms >> 24 & 0x7f);
         adm1026_write_value(client, ADM1026_REG_STATUS4,gpio & 0xff);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -1331,7 +1332,7 @@ static ssize_t set_gpio_mask(struct device *dev, struct device_attribute *attr,
         int val = simple_strtol(buf, NULL, 10);
         long   mask;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->gpio_mask = val & 0x1ffff;
         mask = data->gpio_mask;
         adm1026_write_value(client, ADM1026_REG_GPIO_MASK_0_7,mask & 0xff);
@@ -1339,7 +1340,7 @@ static ssize_t set_gpio_mask(struct device *dev, struct device_attribute *attr,
         adm1026_write_value(client, ADM1026_REG_GPIO_MASK_8_15,mask & 0xff);
         mask = ((mask >> 1) & 0x80) | (data->alarm_mask >> 24 & 0x7f);
         adm1026_write_value(client, ADM1026_REG_MASK1,mask & 0xff);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -1359,10 +1360,10 @@ static ssize_t set_pwm_reg(struct device *dev, struct device_attribute *attr, co
         if (data->pwm1.enable == 1) {
                 int val = simple_strtol(buf, NULL, 10);
 
-                down(&data->update_lock);
+                mutex_lock(&data->update_lock);
                 data->pwm1.pwm = PWM_TO_REG(val);
                 adm1026_write_value(client, ADM1026_REG_PWM, data->pwm1.pwm);
-                up(&data->update_lock);
+                mutex_unlock(&data->update_lock);
         }
         return count;
 }
@@ -1378,14 +1379,14 @@ static ssize_t set_auto_pwm_min(struct device *dev, struct device_attribute *att
         struct adm1026_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->pwm1.auto_pwm_min = SENSORS_LIMIT(val,0,255);
         if (data->pwm1.enable == 2) { /* apply immediately */
                 data->pwm1.pwm = PWM_TO_REG((data->pwm1.pwm & 0x0f) |
                         PWM_MIN_TO_REG(data->pwm1.auto_pwm_min)); 
                 adm1026_write_value(client, ADM1026_REG_PWM, data->pwm1.pwm);
         }
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 static ssize_t show_auto_pwm_max(struct device *dev, struct device_attribute *attr, char *buf)
@@ -1406,7 +1407,7 @@ static ssize_t set_pwm_enable(struct device *dev, struct device_attribute *attr,
         int     old_enable;
 
         if ((val >= 0) && (val < 3)) {
-                down(&data->update_lock);
+                mutex_lock(&data->update_lock);
                 old_enable = data->pwm1.enable;
                 data->pwm1.enable = val;
                 data->config1 = (data->config1 & ~CFG1_PWM_AFC)
@@ -1424,7 +1425,7 @@ static ssize_t set_pwm_enable(struct device *dev, struct device_attribute *attr,
                         adm1026_write_value(client, ADM1026_REG_PWM, 
                                 data->pwm1.pwm);
                 }
-                up(&data->update_lock);
+                mutex_unlock(&data->update_lock);
         }
         return count;
 }
@@ -1541,7 +1542,7 @@ static int adm1026_detect(struct i2c_adapter *adapter, int address,
         /* Fill in the remaining client fields */
         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)))
diff --git a/drivers/hwmon/adm1031.c b/drivers/hwmon/adm1031.c
index d06397966081..3bf2da621aed 100644
--- a/drivers/hwmon/adm1031.c
+++ b/drivers/hwmon/adm1031.c
@@ -28,6 +28,7 @@
 #include <linux/i2c.h>
 #include <linux/hwmon.h>
 #include <linux/err.h>
+#include <linux/mutex.h>
 
 /* Following macros takes channel parameter starting from 0 to 2 */
 #define ADM1031_REG_FAN_SPEED(nr)       (0x08 + (nr))
@@ -70,7 +71,7 @@ typedef u8 auto_chan_table_t[8][2];
 struct adm1031_data {
         struct i2c_client client;
         struct class_device *class_dev;
-        struct semaphore update_lock;
+        struct mutex update_lock;
         int chip_type;
         char valid;             /* !=0 if following fields are valid */
         unsigned long last_updated;     /* In jiffies */
@@ -262,10 +263,10 @@ set_fan_auto_channel(struct device *dev, const char *buf, size_t count, int nr)
 
         old_fan_mode = data->conf1;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         
         if ((ret = get_fan_auto_nearest(data, nr, val, data->conf1, &reg))) {
-                up(&data->update_lock);
+                mutex_unlock(&data->update_lock);
                 return ret;
         }
         if (((data->conf1 = FAN_CHAN_TO_REG(reg, data->conf1)) & ADM1031_CONF1_AUTO_MODE) ^ 
@@ -288,7 +289,7 @@ set_fan_auto_channel(struct device *dev, const char *buf, size_t count, int nr)
         }
         data->conf1 = FAN_CHAN_TO_REG(reg, data->conf1);
         adm1031_write_value(client, ADM1031_REG_CONF1, data->conf1);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -329,11 +330,11 @@ set_auto_temp_min(struct device *dev, const char *buf, size_t count, int nr)
         struct adm1031_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->auto_temp[nr] = AUTO_TEMP_MIN_TO_REG(val, data->auto_temp[nr]);
         adm1031_write_value(client, ADM1031_REG_AUTO_TEMP(nr),
                             data->auto_temp[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 static ssize_t show_auto_temp_max(struct device *dev, char *buf, int nr)
@@ -349,11 +350,11 @@ set_auto_temp_max(struct device *dev, const char *buf, size_t count, int nr)
         struct adm1031_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp_max[nr] = AUTO_TEMP_MAX_TO_REG(val, data->auto_temp[nr], data->pwm[nr]);
         adm1031_write_value(client, ADM1031_REG_AUTO_TEMP(nr),
                             data->temp_max[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -405,11 +406,11 @@ set_pwm(struct device *dev, const char *buf, size_t count, int nr)
         int val = simple_strtol(buf, NULL, 10);
         int reg;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         if ((data->conf1 & ADM1031_CONF1_AUTO_MODE) && 
             (((val>>4) & 0xf) != 5)) {
                 /* In automatic mode, the only PWM accepted is 33% */
-                up(&data->update_lock);
+                mutex_unlock(&data->update_lock);
                 return -EINVAL;
         }
         data->pwm[nr] = PWM_TO_REG(val);
@@ -417,7 +418,7 @@ set_pwm(struct device *dev, const char *buf, size_t count, int nr)
         adm1031_write_value(client, ADM1031_REG_PWM,
                             nr ? ((data->pwm[nr] << 4) & 0xf0) | (reg & 0xf)
                             : (data->pwm[nr] & 0xf) | (reg & 0xf0));
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -511,7 +512,7 @@ set_fan_min(struct device *dev, const char *buf, size_t count, int nr)
         struct adm1031_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         if (val) {
                 data->fan_min[nr] = 
                         FAN_TO_REG(val, FAN_DIV_FROM_REG(data->fan_div[nr]));
@@ -519,7 +520,7 @@ set_fan_min(struct device *dev, const char *buf, size_t count, int nr)
                 data->fan_min[nr] = 0xff;
         }
         adm1031_write_value(client, ADM1031_REG_FAN_MIN(nr), data->fan_min[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 static ssize_t
@@ -540,7 +541,7 @@ set_fan_div(struct device *dev, const char *buf, size_t count, int nr)
         if (tmp == 0xff)
                 return -EINVAL;
         
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         old_div = FAN_DIV_FROM_REG(data->fan_div[nr]);
         data->fan_div[nr] = (tmp & 0xC0) | (0x3f & data->fan_div[nr]);
         new_min = data->fan_min[nr] * old_div / 
@@ -553,7 +554,7 @@ set_fan_div(struct device *dev, const char *buf, size_t count, int nr)
                             data->fan_div[nr]);
         adm1031_write_value(client, ADM1031_REG_FAN_MIN(nr), 
                             data->fan_min[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -627,11 +628,11 @@ set_temp_min(struct device *dev, const char *buf, size_t count, int nr)
 
         val = simple_strtol(buf, NULL, 10);
         val = SENSORS_LIMIT(val, -55000, nr == 0 ? 127750 : 127875);
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp_min[nr] = TEMP_TO_REG(val);
         adm1031_write_value(client, ADM1031_REG_TEMP_MIN(nr),
                             data->temp_min[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 static ssize_t
@@ -643,11 +644,11 @@ set_temp_max(struct device *dev, const char *buf, size_t count, int nr)
 
         val = simple_strtol(buf, NULL, 10);
         val = SENSORS_LIMIT(val, -55000, nr == 0 ? 127750 : 127875);
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp_max[nr] = TEMP_TO_REG(val);
         adm1031_write_value(client, ADM1031_REG_TEMP_MAX(nr),
                             data->temp_max[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 static ssize_t
@@ -659,11 +660,11 @@ set_temp_crit(struct device *dev, const char *buf, size_t count, int nr)
 
         val = simple_strtol(buf, NULL, 10);
         val = SENSORS_LIMIT(val, -55000, nr == 0 ? 127750 : 127875);
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp_crit[nr] = TEMP_TO_REG(val);
         adm1031_write_value(client, ADM1031_REG_TEMP_CRIT(nr),
                             data->temp_crit[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -778,7 +779,7 @@ static int adm1031_detect(struct i2c_adapter *adapter, int address, int kind)
 
         strlcpy(new_client->name, name, I2C_NAME_SIZE);
         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)))
@@ -891,7 +892,7 @@ static struct adm1031_data *adm1031_update_device(struct device *dev)
         struct adm1031_data *data = i2c_get_clientdata(client);
         int chan;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
             || !data->valid) {
@@ -965,7 +966,7 @@ static struct adm1031_data *adm1031_update_device(struct device *dev)
                 data->valid = 1;
         }
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return data;
 }
diff --git a/drivers/hwmon/adm9240.c b/drivers/hwmon/adm9240.c
index 5ddc22fea4a3..43f6991b588c 100644
--- a/drivers/hwmon/adm9240.c
+++ b/drivers/hwmon/adm9240.c
@@ -49,6 +49,7 @@
 #include <linux/hwmon.h>
 #include <linux/hwmon-vid.h>
 #include <linux/err.h>
+#include <linux/mutex.h>
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f,
@@ -150,7 +151,7 @@ struct adm9240_data {
         enum chips type;
         struct i2c_client client;
         struct class_device *class_dev;
-        struct semaphore update_lock;
+        struct mutex update_lock;
         char valid;
         unsigned long last_updated_measure;
         unsigned long last_updated_config;
@@ -195,11 +196,11 @@ static ssize_t set_max(struct device *dev, struct device_attribute *devattr,
         struct adm9240_data *data = i2c_get_clientdata(client);
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp_max[attr->index] = TEMP_TO_REG(val);
         i2c_smbus_write_byte_data(client, ADM9240_REG_TEMP_MAX(attr->index),
                         data->temp_max[attr->index]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -246,11 +247,11 @@ static ssize_t set_in_min(struct device *dev,
         struct adm9240_data *data = i2c_get_clientdata(client);
         unsigned long val = simple_strtoul(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->in_min[attr->index] = IN_TO_REG(val, attr->index);
         i2c_smbus_write_byte_data(client, ADM9240_REG_IN_MIN(attr->index),
                         data->in_min[attr->index]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -263,11 +264,11 @@ static ssize_t set_in_max(struct device *dev,
         struct adm9240_data *data = i2c_get_clientdata(client);
         unsigned long val = simple_strtoul(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->in_max[attr->index] = IN_TO_REG(val, attr->index);
         i2c_smbus_write_byte_data(client, ADM9240_REG_IN_MAX(attr->index),
                         data->in_max[attr->index]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -350,7 +351,7 @@ static ssize_t set_fan_min(struct device *dev,
         int nr = attr->index;
         u8 new_div;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         if (!val) {
                 data->fan_min[nr] = 255;
@@ -390,7 +391,7 @@ static ssize_t set_fan_min(struct device *dev,
         i2c_smbus_write_byte_data(client, ADM9240_REG_FAN_MIN(nr),
                         data->fan_min[nr]);
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -439,10 +440,10 @@ static ssize_t set_aout(struct device *dev,
         struct adm9240_data *data = i2c_get_clientdata(client);
         unsigned long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->aout = AOUT_TO_REG(val);
         i2c_smbus_write_byte_data(client, ADM9240_REG_ANALOG_OUT, data->aout);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 static DEVICE_ATTR(aout_output, S_IRUGO | S_IWUSR, show_aout, set_aout);
@@ -539,7 +540,7 @@ static int adm9240_detect(struct i2c_adapter *adapter, int address, int kind)
         /* fill in the remaining client fields and attach */
         strlcpy(new_client->name, name, I2C_NAME_SIZE);
         data->type = kind;
-        init_MUTEX(&data->update_lock);
+        mutex_init(&data->update_lock);
 
         if ((err = i2c_attach_client(new_client)))
                 goto exit_free;
@@ -691,7 +692,7 @@ static struct adm9240_data *adm9240_update_device(struct device *dev)
         struct adm9240_data *data = i2c_get_clientdata(client);
         int i;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         /* minimum measurement cycle: 1.75 seconds */
         if (time_after(jiffies, data->last_updated_measure + (HZ * 7 / 4))
@@ -771,7 +772,7 @@ static struct adm9240_data *adm9240_update_device(struct device *dev)
                 data->last_updated_config = jiffies;
                 data->valid = 1;
         }
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return data;
 }
 
diff --git a/drivers/hwmon/asb100.c b/drivers/hwmon/asb100.c
index ae9de63cf2e0..65b2709f750c 100644
--- a/drivers/hwmon/asb100.c
+++ b/drivers/hwmon/asb100.c
@@ -44,6 +44,7 @@
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/jiffies.h>
+#include <linux/mutex.h>
 #include "lm75.h"
 
 /*
@@ -182,10 +183,10 @@ static u8 DIV_TO_REG(long val)
 struct asb100_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;
         unsigned long last_updated;     /* In jiffies */
 
         /* array of 2 pointers to subclients */
@@ -245,11 +246,11 @@ static ssize_t set_in_##reg(struct device *dev, const char *buf, \
         struct asb100_data *data = i2c_get_clientdata(client); \
         unsigned long val = simple_strtoul(buf, NULL, 10); \
  \
-        down(&data->update_lock); \
+        mutex_lock(&data->update_lock); \
         data->in_##reg[nr] = IN_TO_REG(val); \
         asb100_write_value(client, ASB100_REG_IN_##REG(nr), \
                 data->in_##reg[nr]); \
-        up(&data->update_lock); \
+        mutex_unlock(&data->update_lock); \
         return count; \
 }
 
@@ -331,10 +332,10 @@ static ssize_t set_fan_min(struct device *dev, const char *buf,
         struct asb100_data *data = i2c_get_clientdata(client);
         u32 val = simple_strtoul(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->fan_min[nr] = FAN_TO_REG(val, DIV_FROM_REG(data->fan_div[nr]));
         asb100_write_value(client, ASB100_REG_FAN_MIN(nr), data->fan_min[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -351,7 +352,7 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
         unsigned long val = simple_strtoul(buf, NULL, 10);
         int reg;
         
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         min = FAN_FROM_REG(data->fan_min[nr],
                         DIV_FROM_REG(data->fan_div[nr]));
@@ -381,7 +382,7 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
                 FAN_TO_REG(min, DIV_FROM_REG(data->fan_div[nr]));
         asb100_write_value(client, ASB100_REG_FAN_MIN(nr), data->fan_min[nr]);
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return count;
 }
@@ -461,7 +462,7 @@ static ssize_t set_##reg(struct device *dev, const char *buf, \
         struct asb100_data *data = i2c_get_clientdata(client); \
         unsigned long val = simple_strtoul(buf, NULL, 10); \
  \
-        down(&data->update_lock); \
+        mutex_lock(&data->update_lock); \
         switch (nr) { \
         case 1: case 2: \
                 data->reg[nr] = LM75_TEMP_TO_REG(val); \
@@ -472,7 +473,7 @@ static ssize_t set_##reg(struct device *dev, const char *buf, \
         } \
         asb100_write_value(client, ASB100_REG_TEMP_##REG(nr+1), \
                         data->reg[nr]); \
-        up(&data->update_lock); \
+        mutex_unlock(&data->update_lock); \
         return count; \
 }
 
@@ -574,11 +575,11 @@ static ssize_t set_pwm1(struct device *dev, struct device_attribute *attr, const
         struct asb100_data *data = i2c_get_clientdata(client);
         unsigned long val = simple_strtoul(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->pwm &= 0x80; /* keep the enable bit */
         data->pwm |= (0x0f & ASB100_PWM_TO_REG(val));
         asb100_write_value(client, ASB100_REG_PWM1, data->pwm);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -595,11 +596,11 @@ static ssize_t set_pwm_enable1(struct device *dev, struct device_attribute *attr
         struct asb100_data *data = i2c_get_clientdata(client);
         unsigned long val = simple_strtoul(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->pwm &= 0x0f; /* keep the duty cycle bits */
         data->pwm |= (val ? 0x80 : 0x00);
         asb100_write_value(client, ASB100_REG_PWM1, data->pwm);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -729,7 +730,7 @@ static int asb100_detect(struct i2c_adapter *adapter, int address, int kind)
         }
 
         new_client = &data->client;
-        init_MUTEX(&data->lock);
+        mutex_init(&data->lock);
         i2c_set_clientdata(new_client, data);
         new_client->addr = address;
         new_client->adapter = adapter;
@@ -789,7 +790,7 @@ static int asb100_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)))
@@ -885,7 +886,7 @@ static int asb100_read_value(struct i2c_client *client, u16 reg)
         struct i2c_client *cl;
         int res, bank;
 
-        down(&data->lock);
+        mutex_lock(&data->lock);
 
         bank = (reg >> 8) & 0x0f;
         if (bank > 2)
@@ -919,7 +920,7 @@ static int asb100_read_value(struct i2c_client *client, u16 reg)
         if (bank > 2)
                 i2c_smbus_write_byte_data(client, ASB100_REG_BANK, 0);
 
-        up(&data->lock);
+        mutex_unlock(&data->lock);
 
         return res;
 }
@@ -930,7 +931,7 @@ static void asb100_write_value(struct i2c_client *client, u16 reg, u16 value)
         struct i2c_client *cl;
         int bank;
 
-        down(&data->lock);
+        mutex_lock(&data->lock);
 
         bank = (reg >> 8) & 0x0f;
         if (bank > 2)
@@ -960,7 +961,7 @@ static void asb100_write_value(struct i2c_client *client, u16 reg, u16 value)
         if (bank > 2)
                 i2c_smbus_write_byte_data(client, ASB100_REG_BANK, 0);
 
-        up(&data->lock);
+        mutex_unlock(&data->lock);
 }
 
 static void asb100_init_client(struct i2c_client *client)
@@ -984,7 +985,7 @@ static struct asb100_data *asb100_update_device(struct device *dev)
         struct asb100_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) {
@@ -1042,7 +1043,7 @@ static struct asb100_data *asb100_update_device(struct device *dev)
                 dev_dbg(&client->dev, "... device update complete\n");
         }
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return data;
 }
diff --git a/drivers/hwmon/atxp1.c b/drivers/hwmon/atxp1.c
index b0c490073c8e..728a1e8b9190 100644
--- a/drivers/hwmon/atxp1.c
+++ b/drivers/hwmon/atxp1.c
@@ -26,6 +26,7 @@
 #include <linux/hwmon.h>
 #include <linux/hwmon-vid.h>
 #include <linux/err.h>
+#include <linux/mutex.h>
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("System voltages control via Attansic ATXP1");
@@ -60,7 +61,7 @@ static struct i2c_driver atxp1_driver = {
 struct atxp1_data {
         struct i2c_client client;
         struct class_device *class_dev;
-        struct semaphore update_lock;
+        struct mutex update_lock;
         unsigned long last_updated;
         u8 valid;
         struct {
@@ -80,7 +81,7 @@ static struct atxp1_data * atxp1_update_device(struct device *dev)
         client = to_i2c_client(dev);
         data = i2c_get_clientdata(client);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         if (time_after(jiffies, data->last_updated + HZ) || !data->valid) {
 
@@ -93,7 +94,7 @@ static struct atxp1_data * atxp1_update_device(struct device *dev)
                 data->valid = 1;
         }
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return(data);
 }
@@ -309,7 +310,7 @@ static int atxp1_detect(struct i2c_adapter *adapter, int address, int kind)
 
         data->valid = 0;
 
-        init_MUTEX(&data->update_lock);
+        mutex_init(&data->update_lock);
 
         err = i2c_attach_client(new_client);
 
diff --git a/drivers/hwmon/ds1621.c b/drivers/hwmon/ds1621.c
index 203f9c7abb20..478eb4bb8570 100644
--- a/drivers/hwmon/ds1621.c
+++ b/drivers/hwmon/ds1621.c
@@ -28,6 +28,7 @@
 #include <linux/i2c.h>
 #include <linux/hwmon.h>
 #include <linux/err.h>
+#include <linux/mutex.h>
 #include "lm75.h"
 
 /* Addresses to scan */
@@ -72,7 +73,7 @@ MODULE_PARM_DESC(polarity, "Output's polarity: 0 = active high, 1 = active low")
 struct ds1621_data {
         struct i2c_client client;
         struct class_device *class_dev;
-        struct semaphore update_lock;
+        struct mutex update_lock;
         char valid;                     /* !=0 if following fields are valid */
         unsigned long last_updated;     /* In jiffies */
 
@@ -156,10 +157,10 @@ static ssize_t set_temp_##suffix(struct device *dev, struct device_attribute *at
         struct ds1621_data *data = ds1621_update_client(dev);           \
         u16 val = LM75_TEMP_TO_REG(simple_strtoul(buf, NULL, 10));      \
                                                                         \
-        down(&data->update_lock);                                       \
+        mutex_lock(&data->update_lock);                                 \
         data->value = val;                                              \
         ds1621_write_value(client, reg, data->value);                   \
-        up(&data->update_lock);                                         \
+        mutex_unlock(&data->update_lock);                               \
         return count;                                                   \
 }
 
@@ -242,7 +243,7 @@ static int ds1621_detect(struct i2c_adapter *adapter, int address,
         /* Fill in remaining client fields and put it into the global list */
         strlcpy(new_client->name, "ds1621", I2C_NAME_SIZE);
         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)))
@@ -297,7 +298,7 @@ static struct ds1621_data *ds1621_update_client(struct device *dev)
         struct ds1621_data *data = i2c_get_clientdata(client);
         u8 new_conf;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
             || !data->valid) {
@@ -327,7 +328,7 @@ static struct ds1621_data *ds1621_update_client(struct device *dev)
                 data->valid = 1;
         }
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return data;
 }
diff --git a/drivers/hwmon/fscher.c b/drivers/hwmon/fscher.c
index 25409181d1eb..6bc76b407636 100644
--- a/drivers/hwmon/fscher.c
+++ b/drivers/hwmon/fscher.c
@@ -33,6 +33,7 @@
 #include <linux/i2c.h>
 #include <linux/hwmon.h>
 #include <linux/err.h>
+#include <linux/mutex.h>
 
 /*
  * Addresses to scan
@@ -133,7 +134,7 @@ static struct i2c_driver fscher_driver = {
 struct fscher_data {
         struct i2c_client client;
         struct class_device *class_dev;
-        struct semaphore update_lock;
+        struct mutex update_lock;
         char valid; /* zero until following fields are valid */
         unsigned long last_updated; /* in jiffies */
 
@@ -332,7 +333,7 @@ static int fscher_detect(struct i2c_adapter *adapter, int address, int kind)
          * global list */
         strlcpy(new_client->name, "fscher", I2C_NAME_SIZE);
         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)))
@@ -417,7 +418,7 @@ static struct fscher_data *fscher_update_device(struct device *dev)
         struct i2c_client *client = to_i2c_client(dev);
         struct fscher_data *data = i2c_get_clientdata(client);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         if (time_after(jiffies, data->last_updated + 2 * HZ) || !data->valid) {
 
@@ -457,7 +458,7 @@ static struct fscher_data *fscher_update_device(struct device *dev)
                 data->valid = 1;                 
         }
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return data;
 }
@@ -472,10 +473,10 @@ static ssize_t set_fan_status(struct i2c_client *client, struct fscher_data *dat
         /* bits 0..1, 3..7 reserved => mask with 0x04 */  
         unsigned long v = simple_strtoul(buf, NULL, 10) & 0x04;
         
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->fan_status[FAN_INDEX_FROM_NUM(nr)] &= ~v;
         fscher_write_value(client, reg, v);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -490,10 +491,10 @@ static ssize_t set_pwm(struct i2c_client *client, struct fscher_data *data,
 {
         unsigned long v = simple_strtoul(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->fan_min[FAN_INDEX_FROM_NUM(nr)] = v > 0xff ? 0xff : v;
         fscher_write_value(client, reg, data->fan_min[FAN_INDEX_FROM_NUM(nr)]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -518,14 +519,14 @@ static ssize_t set_fan_div(struct i2c_client *client, struct fscher_data *data,
                 return -EINVAL;
         }
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         /* bits 2..7 reserved => mask with 0x03 */
         data->fan_ripple[FAN_INDEX_FROM_NUM(nr)] &= ~0x03;
         data->fan_ripple[FAN_INDEX_FROM_NUM(nr)] |= v;
 
         fscher_write_value(client, reg, data->fan_ripple[FAN_INDEX_FROM_NUM(nr)]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -552,10 +553,10 @@ static ssize_t set_temp_status(struct i2c_client *client, struct fscher_data *da
         /* bits 2..7 reserved, 0 read only => mask with 0x02 */  
         unsigned long v = simple_strtoul(buf, NULL, 10) & 0x02;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp_status[TEMP_INDEX_FROM_NUM(nr)] &= ~v;
         fscher_write_value(client, reg, v);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -609,10 +610,10 @@ static ssize_t set_control(struct i2c_client *client, struct fscher_data *data,
         /* bits 1..7 reserved => mask with 0x01 */  
         unsigned long v = simple_strtoul(buf, NULL, 10) & 0x01;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->global_control &= ~v;
         fscher_write_value(client, reg, v);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -631,11 +632,11 @@ static ssize_t set_watchdog_control(struct i2c_client *client, struct
         /* bits 0..3 reserved => mask with 0xf0 */  
         unsigned long v = simple_strtoul(buf, NULL, 10) & 0xf0;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->watchdog[2] &= ~0xf0;
         data->watchdog[2] |= v;
         fscher_write_value(client, reg, data->watchdog[2]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -651,10 +652,10 @@ static ssize_t set_watchdog_status(struct i2c_client *client, struct fscher_data
         /* bits 0, 2..7 reserved => mask with 0x02 */  
         unsigned long v = simple_strtoul(buf, NULL, 10) & 0x02;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->watchdog[1] &= ~v;
         fscher_write_value(client, reg, v);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -669,10 +670,10 @@ static ssize_t set_watchdog_preset(struct i2c_client *client, struct fscher_data
 {
         unsigned long v = simple_strtoul(buf, NULL, 10) & 0xff;
         
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->watchdog[0] = v;
         fscher_write_value(client, reg, data->watchdog[0]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
diff --git a/drivers/hwmon/fscpos.c b/drivers/hwmon/fscpos.c
index 6d0146b57020..758978e1bfe0 100644
--- a/drivers/hwmon/fscpos.c
+++ b/drivers/hwmon/fscpos.c
@@ -37,6 +37,7 @@
 #include <linux/init.h>
 #include <linux/hwmon.h>
 #include <linux/err.h>
+#include <linux/mutex.h>
 
 /*
  * Addresses to scan
@@ -114,7 +115,7 @@ static struct i2c_driver fscpos_driver = {
 struct fscpos_data {
         struct i2c_client client;
         struct class_device *class_dev;
-        struct semaphore update_lock;
+        struct mutex update_lock;
         char valid;             /* 0 until following fields are valid */
         unsigned long last_updated;     /* In jiffies */
 
@@ -208,13 +209,13 @@ static ssize_t set_fan_ripple(struct i2c_client *client, struct fscpos_data
                 return -EINVAL;
         }
         
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         /* bits 2..7 reserved => mask with 0x03 */
         data->fan_ripple[nr - 1] &= ~0x03;
         data->fan_ripple[nr - 1] |= v;
         
         fscpos_write_value(client, reg, data->fan_ripple[nr - 1]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -232,10 +233,10 @@ static ssize_t set_pwm(struct i2c_client *client, struct fscpos_data *data,
         if (v < 0) v = 0;
         if (v > 255) v = 255;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->pwm[nr - 1] = v;
         fscpos_write_value(client, reg, data->pwm[nr - 1]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -278,11 +279,11 @@ static ssize_t set_wdog_control(struct i2c_client *client, struct fscpos_data
         /* bits 0..3 reserved => mask with 0xf0 */
         unsigned long v = simple_strtoul(buf, NULL, 10) & 0xf0;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->wdog_control &= ~0xf0;
         data->wdog_control |= v;
         fscpos_write_value(client, reg, data->wdog_control);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -304,10 +305,10 @@ static ssize_t set_wdog_state(struct i2c_client *client, struct fscpos_data
                 return -EINVAL;
         }
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->wdog_state &= ~v;
         fscpos_write_value(client, reg, v);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -321,10 +322,10 @@ static ssize_t set_wdog_preset(struct i2c_client *client, struct fscpos_data
 {
         unsigned long v = simple_strtoul(buf, NULL, 10) & 0xff;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->wdog_preset = v;
         fscpos_write_value(client, reg, data->wdog_preset);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -483,7 +484,7 @@ static int fscpos_detect(struct i2c_adapter *adapter, int address, int kind)
         strlcpy(new_client->name, "fscpos", I2C_NAME_SIZE);
 
         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)))
@@ -579,7 +580,7 @@ static struct fscpos_data *fscpos_update_device(struct device *dev)
         struct i2c_client *client = to_i2c_client(dev);
         struct fscpos_data *data = i2c_get_clientdata(client);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         if (time_after(jiffies, data->last_updated + 2 * HZ) || !data->valid) {
                 int i;
@@ -625,7 +626,7 @@ static struct fscpos_data *fscpos_update_device(struct device *dev)
                 data->last_updated = jiffies;
                 data->valid = 1;
         }
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return data;
 }
 
diff --git a/drivers/hwmon/gl518sm.c b/drivers/hwmon/gl518sm.c
index 9e685e3a3bc9..6606aabdb49d 100644
--- a/drivers/hwmon/gl518sm.c
+++ b/drivers/hwmon/gl518sm.c
@@ -43,6 +43,7 @@
 #include <linux/i2c.h>
 #include <linux/hwmon.h>
 #include <linux/err.h>
+#include <linux/mutex.h>
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END };
@@ -120,7 +121,7 @@ struct gl518_data {
         struct class_device *class_dev;
         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 */
 
@@ -212,10 +213,10 @@ static ssize_t set_##suffix(struct device *dev, struct device_attribute *attr, c
         struct gl518_data *data = i2c_get_clientdata(client);           \
         long val = simple_strtol(buf, NULL, 10);                        \
                                                                         \
-        down(&data->update_lock);                                       \
+        mutex_lock(&data->update_lock);                                 \
         data->value = type##_TO_REG(val);                               \
         gl518_write_value(client, reg, data->value);                    \
-        up(&data->update_lock);                                         \
+        mutex_unlock(&data->update_lock);                               \
         return count;                                                   \
 }
 
@@ -228,12 +229,12 @@ static ssize_t set_##suffix(struct device *dev, struct device_attribute *attr, c
         int regvalue;                                                   \
         unsigned long val = simple_strtoul(buf, NULL, 10);              \
                                                                         \
-        down(&data->update_lock);                                       \
+        mutex_lock(&data->update_lock);                                 \
         regvalue = gl518_read_value(client, reg);                       \
         data->value = type##_TO_REG(val);                               \
         regvalue = (regvalue & ~mask) | (data->value << shift);         \
         gl518_write_value(client, reg, regvalue);                       \
-        up(&data->update_lock);                                         \
+        mutex_unlock(&data->update_lock);                               \
         return count;                                                   \
 }
 
@@ -265,7 +266,7 @@ static ssize_t set_fan_min1(struct device *dev, struct device_attribute *attr, c
         int regvalue;
         unsigned long val = simple_strtoul(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         regvalue = gl518_read_value(client, GL518_REG_FAN_LIMIT);
         data->fan_min[0] = FAN_TO_REG(val,
                 DIV_FROM_REG(data->fan_div[0]));
@@ -280,7 +281,7 @@ static ssize_t set_fan_min1(struct device *dev, struct device_attribute *attr, c
         data->beep_mask &= data->alarm_mask;
         gl518_write_value(client, GL518_REG_ALARM, data->beep_mask);
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -291,7 +292,7 @@ static ssize_t set_fan_min2(struct device *dev, struct device_attribute *attr, c
         int regvalue;
         unsigned long val = simple_strtoul(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         regvalue = gl518_read_value(client, GL518_REG_FAN_LIMIT);
         data->fan_min[1] = FAN_TO_REG(val,
                 DIV_FROM_REG(data->fan_div[1]));
@@ -306,7 +307,7 @@ static ssize_t set_fan_min2(struct device *dev, struct device_attribute *attr, c
         data->beep_mask &= data->alarm_mask;
         gl518_write_value(client, GL518_REG_ALARM, data->beep_mask);
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -407,7 +408,7 @@ static int gl518_detect(struct i2c_adapter *adapter, int address, int kind)
         strlcpy(new_client->name, "gl518sm", I2C_NAME_SIZE);
         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)))
@@ -525,7 +526,7 @@ static struct gl518_data *gl518_update_device(struct device *dev)
         struct gl518_data *data = i2c_get_clientdata(client);
         int val;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
             || !data->valid) {
@@ -586,7 +587,7 @@ static struct gl518_data *gl518_update_device(struct device *dev)
                 data->valid = 1;
         }
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return data;
 }
diff --git a/drivers/hwmon/gl520sm.c b/drivers/hwmon/gl520sm.c
index baee60e44b52..47b4d49f75c6 100644
--- a/drivers/hwmon/gl520sm.c
+++ b/drivers/hwmon/gl520sm.c
@@ -29,6 +29,7 @@
 #include <linux/hwmon.h>
 #include <linux/hwmon-vid.h>
 #include <linux/err.h>
+#include <linux/mutex.h>
 
 /* Type of the extra sensor */
 static unsigned short extra_sensor_type;
@@ -121,7 +122,7 @@ static struct i2c_driver gl520_driver = {
 struct gl520_data {
         struct i2c_client client;
         struct class_device *class_dev;
-        struct semaphore update_lock;
+        struct mutex update_lock;
         char valid;             /* zero until the following fields are valid */
         unsigned long last_updated;     /* in jiffies */
 
@@ -303,7 +304,7 @@ static ssize_t set_in_min(struct i2c_client *client, struct gl520_data *data, co
         long v = simple_strtol(buf, NULL, 10);
         u8 r;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         if (n == 0)
                 r = VDD_TO_REG(v);
@@ -317,7 +318,7 @@ static ssize_t set_in_min(struct i2c_client *client, struct gl520_data *data, co
         else
                 gl520_write_value(client, reg, r);
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -331,7 +332,7 @@ static ssize_t set_in_max(struct i2c_client *client, struct gl520_data *data, co
         else
                 r = IN_TO_REG(v);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         data->in_max[n] = r;
 
@@ -340,7 +341,7 @@ static ssize_t set_in_max(struct i2c_client *client, struct gl520_data *data, co
         else
                 gl520_write_value(client, reg, r);
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -373,7 +374,7 @@ static ssize_t set_fan_min(struct i2c_client *client, struct gl520_data *data, c
         unsigned long v = simple_strtoul(buf, NULL, 10);
         u8 r;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         r = FAN_TO_REG(v, data->fan_div[n - 1]);
         data->fan_min[n - 1] = r;
 
@@ -390,7 +391,7 @@ static ssize_t set_fan_min(struct i2c_client *client, struct gl520_data *data, c
         data->beep_mask &= data->alarm_mask;
         gl520_write_value(client, GL520_REG_BEEP_MASK, data->beep_mask);
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -409,7 +410,7 @@ static ssize_t set_fan_div(struct i2c_client *client, struct gl520_data *data, c
                 return -EINVAL;
         }
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->fan_div[n - 1] = r;
 
         if (n == 1)
@@ -417,7 +418,7 @@ static ssize_t set_fan_div(struct i2c_client *client, struct gl520_data *data, c
         else
                 gl520_write_value(client, reg, (gl520_read_value(client, reg) & ~0x30) | (r << 4));
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -425,10 +426,10 @@ static ssize_t set_fan_off(struct i2c_client *client, struct gl520_data *data, c
 {
         u8 r = simple_strtoul(buf, NULL, 10)?1:0;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->fan_off = r;
         gl520_write_value(client, reg, (gl520_read_value(client, reg) & ~0x0c) | (r << 2));
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -454,10 +455,10 @@ static ssize_t set_temp_max(struct i2c_client *client, struct gl520_data *data,
 {
         long v = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp_max[n - 1] = TEMP_TO_REG(v);;
         gl520_write_value(client, reg, data->temp_max[n - 1]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -465,10 +466,10 @@ static ssize_t set_temp_max_hyst(struct i2c_client *client, struct gl520_data *d
 {
         long v = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp_max_hyst[n - 1] = TEMP_TO_REG(v);
         gl520_write_value(client, reg, data->temp_max_hyst[n - 1]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -491,10 +492,10 @@ static ssize_t set_beep_enable(struct i2c_client *client, struct gl520_data *dat
 {
         u8 r = simple_strtoul(buf, NULL, 10)?0:1;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->beep_enable = !r;
         gl520_write_value(client, reg, (gl520_read_value(client, reg) & ~0x04) | (r << 2));
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -502,11 +503,11 @@ static ssize_t set_beep_mask(struct i2c_client *client, struct gl520_data *data,
 {
         u8 r = simple_strtoul(buf, NULL, 10);
         
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         r &= data->alarm_mask;
         data->beep_mask = r;
         gl520_write_value(client, reg, r);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -561,7 +562,7 @@ static int gl520_detect(struct i2c_adapter *adapter, int address, int kind)
         /* Fill in the remaining client fields */
         strlcpy(new_client->name, "gl520sm", I2C_NAME_SIZE);
         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)))
@@ -685,7 +686,7 @@ static struct gl520_data *gl520_update_device(struct device *dev)
         struct gl520_data *data = i2c_get_clientdata(client);
         int val;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         if (time_after(jiffies, data->last_updated + 2 * HZ) || !data->valid) {
 
@@ -750,7 +751,7 @@ static struct gl520_data *gl520_update_device(struct device *dev)
                 data->valid = 1;
         }
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return data;
 }
diff --git a/drivers/hwmon/hdaps.c b/drivers/hwmon/hdaps.c
index 23a9e1ea8e32..7636c1a58f9c 100644
--- a/drivers/hwmon/hdaps.c
+++ b/drivers/hwmon/hdaps.c
@@ -33,6 +33,7 @@
 #include <linux/module.h>
 #include <linux/timer.h>
 #include <linux/dmi.h>
+#include <linux/mutex.h>
 #include <asm/io.h>
 
 #define HDAPS_LOW_PORT          0x1600  /* first port used by hdaps */
@@ -70,10 +71,10 @@ static u8 km_activity;
 static int rest_x;
 static int rest_y;
 
-static DECLARE_MUTEX(hdaps_sem);
+static DEFINE_MUTEX(hdaps_mutex);
 
 /*
- * __get_latch - Get the value from a given port.  Callers must hold hdaps_sem.
+ * __get_latch - Get the value from a given port.  Callers must hold hdaps_mutex.
  */
 static inline u8 __get_latch(u16 port)
 {
@@ -82,7 +83,7 @@ static inline u8 __get_latch(u16 port)
 
 /*
  * __check_latch - Check a port latch for a given value.  Returns zero if the
- * port contains the given value.  Callers must hold hdaps_sem.
+ * port contains the given value.  Callers must hold hdaps_mutex.
  */
 static inline int __check_latch(u16 port, u8 val)
 {
@@ -93,7 +94,7 @@ static inline int __check_latch(u16 port, u8 val)
 
 /*
  * __wait_latch - Wait up to 100us for a port latch to get a certain value,
- * returning zero if the value is obtained.  Callers must hold hdaps_sem.
+ * returning zero if the value is obtained.  Callers must hold hdaps_mutex.
  */
 static int __wait_latch(u16 port, u8 val)
 {
@@ -110,7 +111,7 @@ static int __wait_latch(u16 port, u8 val)
 
 /*
  * __device_refresh - request a refresh from the accelerometer.  Does not wait
- * for refresh to complete.  Callers must hold hdaps_sem.
+ * for refresh to complete.  Callers must hold hdaps_mutex.
  */
 static void __device_refresh(void)
 {
@@ -124,7 +125,7 @@ static void __device_refresh(void)
 /*
  * __device_refresh_sync - request a synchronous refresh from the
  * accelerometer.  We wait for the refresh to complete.  Returns zero if
- * successful and nonzero on error.  Callers must hold hdaps_sem.
+ * successful and nonzero on error.  Callers must hold hdaps_mutex.
  */
 static int __device_refresh_sync(void)
 {
@@ -134,7 +135,7 @@ static int __device_refresh_sync(void)
 
 /*
  * __device_complete - indicate to the accelerometer that we are done reading
- * data, and then initiate an async refresh.  Callers must hold hdaps_sem.
+ * data, and then initiate an async refresh.  Callers must hold hdaps_mutex.
  */
 static inline void __device_complete(void)
 {
@@ -152,7 +153,7 @@ static int hdaps_readb_one(unsigned int port, u8 *val)
 {
         int ret;
 
-        down(&hdaps_sem);
+        mutex_lock(&hdaps_mutex);
 
         /* do a sync refresh -- we need to be sure that we read fresh data */
         ret = __device_refresh_sync();
@@ -163,7 +164,7 @@ static int hdaps_readb_one(unsigned int port, u8 *val)
         __device_complete();
 
 out:
-        up(&hdaps_sem);
+        mutex_unlock(&hdaps_mutex);
         return ret;
 }
 
@@ -198,9 +199,9 @@ static int hdaps_read_pair(unsigned int port1, unsigned int port2,
 {
         int ret;
 
-        down(&hdaps_sem);
+        mutex_lock(&hdaps_mutex);
         ret = __hdaps_read_pair(port1, port2, val1, val2);
-        up(&hdaps_sem);
+        mutex_unlock(&hdaps_mutex);
 
         return ret;
 }
@@ -213,7 +214,7 @@ static int hdaps_device_init(void)
 {
         int total, ret = -ENXIO;
 
-        down(&hdaps_sem);
+        mutex_lock(&hdaps_mutex);
 
         outb(0x13, 0x1610);
         outb(0x01, 0x161f);
@@ -279,7 +280,7 @@ static int hdaps_device_init(void)
         }
 
 out:
-        up(&hdaps_sem);
+        mutex_unlock(&hdaps_mutex);
         return ret;
 }
 
@@ -313,7 +314,7 @@ static struct platform_driver hdaps_driver = {
 };
 
 /*
- * hdaps_calibrate - Set our "resting" values.  Callers must hold hdaps_sem.
+ * hdaps_calibrate - Set our "resting" values.  Callers must hold hdaps_mutex.
  */
 static void hdaps_calibrate(void)
 {
@@ -325,7 +326,7 @@ static void hdaps_mousedev_poll(unsigned long unused)
         int x, y;
 
         /* Cannot sleep.  Try nonblockingly.  If we fail, try again later. */
-        if (down_trylock(&hdaps_sem)) {
+        if (!mutex_trylock(&hdaps_mutex)) {
                 mod_timer(&hdaps_timer,jiffies + HDAPS_POLL_PERIOD);
                 return;
         }
@@ -340,7 +341,7 @@ static void hdaps_mousedev_poll(unsigned long unused)
         mod_timer(&hdaps_timer, jiffies + HDAPS_POLL_PERIOD);
 
 out:
-        up(&hdaps_sem);
+        mutex_unlock(&hdaps_mutex);
 }
 
 
@@ -420,9 +421,9 @@ static ssize_t hdaps_calibrate_store(struct device *dev,
                                      struct device_attribute *attr,
                                      const char *buf, size_t count)
 {
-        down(&hdaps_sem);
+        mutex_lock(&hdaps_mutex);
         hdaps_calibrate();
-        up(&hdaps_sem);
+        mutex_unlock(&hdaps_mutex);
 
         return count;
 }
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
index d7a9401600bb..122ff9cd75cb 100644
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
@@ -41,6 +41,7 @@
 #include <linux/hwmon-sysfs.h>
 #include <linux/hwmon-vid.h>
 #include <linux/err.h>
+#include <linux/mutex.h>
 #include <asm/io.h>
 
 
@@ -194,10 +195,10 @@ static int DIV_TO_REG(int val)
 struct it87_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 */
 
@@ -290,11 +291,11 @@ static ssize_t set_in_min(struct device *dev, struct device_attribute *attr,
         struct it87_data *data = i2c_get_clientdata(client);
         unsigned long val = simple_strtoul(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->in_min[nr] = IN_TO_REG(val);
         it87_write_value(client, IT87_REG_VIN_MIN(nr), 
                         data->in_min[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 static ssize_t set_in_max(struct device *dev, struct device_attribute *attr,
@@ -307,11 +308,11 @@ static ssize_t set_in_max(struct device *dev, struct device_attribute *attr,
         struct it87_data *data = i2c_get_clientdata(client);
         unsigned long val = simple_strtoul(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->in_max[nr] = IN_TO_REG(val);
         it87_write_value(client, IT87_REG_VIN_MAX(nr), 
                         data->in_max[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -381,10 +382,10 @@ static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,
         struct it87_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp_high[nr] = TEMP_TO_REG(val);
         it87_write_value(client, IT87_REG_TEMP_HIGH(nr), data->temp_high[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,
@@ -397,10 +398,10 @@ static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,
         struct it87_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp_low[nr] = TEMP_TO_REG(val);
         it87_write_value(client, IT87_REG_TEMP_LOW(nr), data->temp_low[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 #define show_temp_offset(offset)                                        \
@@ -440,7 +441,7 @@ static ssize_t set_sensor(struct device *dev, struct device_attribute *attr,
         struct it87_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         data->sensor &= ~(1 << nr);
         data->sensor &= ~(8 << nr);
@@ -450,11 +451,11 @@ static ssize_t set_sensor(struct device *dev, struct device_attribute *attr,
         else if (val == 2)
             data->sensor |= 8 << nr;
         else if (val != 0) {
-                up(&data->update_lock);
+                mutex_unlock(&data->update_lock);
                 return -EINVAL;
         }
         it87_write_value(client, IT87_REG_TEMP_ENABLE, data->sensor);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 #define show_sensor_offset(offset)                                      \
@@ -524,7 +525,7 @@ static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr,
         int val = simple_strtol(buf, NULL, 10);
         u8 reg = it87_read_value(client, IT87_REG_FAN_DIV);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         switch (nr) {
         case 0: data->fan_div[nr] = reg & 0x07; break;
         case 1: data->fan_div[nr] = (reg >> 3) & 0x07; break;
@@ -533,7 +534,7 @@ static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr,
 
         data->fan_min[nr] = FAN_TO_REG(val, DIV_FROM_REG(data->fan_div[nr]));
         it87_write_value(client, IT87_REG_FAN_MIN(nr), data->fan_min[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,
@@ -548,7 +549,7 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,
         int i, min[3];
         u8 old;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         old = it87_read_value(client, IT87_REG_FAN_DIV);
 
         for (i = 0; i < 3; i++)
@@ -576,7 +577,7 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,
                 data->fan_min[i]=FAN_TO_REG(min[i], DIV_FROM_REG(data->fan_div[i]));
                 it87_write_value(client, IT87_REG_FAN_MIN(i), data->fan_min[i]);
         }
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 static ssize_t set_pwm_enable(struct device *dev,
@@ -589,7 +590,7 @@ static ssize_t set_pwm_enable(struct device *dev,
         struct it87_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         if (val == 0) {
                 int tmp;
@@ -606,11 +607,11 @@ static ssize_t set_pwm_enable(struct device *dev,
                 /* set saved pwm value, clear FAN_CTLX PWM mode bit */
                 it87_write_value(client, IT87_REG_PWM(nr), PWM_TO_REG(data->manual_pwm_ctl[nr]));
         } else {
-                up(&data->update_lock);
+                mutex_unlock(&data->update_lock);
                 return -EINVAL;
         }
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
@@ -626,11 +627,11 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
         if (val < 0 || val > 255)
                 return -EINVAL;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->manual_pwm_ctl[nr] = val;
         if (data->fan_main_ctrl & (1 << nr))
                 it87_write_value(client, IT87_REG_PWM(nr), PWM_TO_REG(data->manual_pwm_ctl[nr]));
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -776,7 +777,7 @@ static int it87_detect(struct i2c_adapter *adapter, int address, int kind)
 
         new_client = &data->client;
         if (is_isa)
-                init_MUTEX(&data->lock);
+                mutex_init(&data->lock);
         i2c_set_clientdata(new_client, data);
         new_client->addr = address;
         new_client->adapter = adapter;
@@ -823,7 +824,7 @@ static int it87_detect(struct i2c_adapter *adapter, int address, int kind)
         strlcpy(new_client->name, name, I2C_NAME_SIZE);
         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)))
@@ -950,10 +951,10 @@ static int it87_read_value(struct i2c_client *client, u8 reg)
 
         int res;
         if (i2c_is_isa_client(client)) {
-                down(&data->lock);
+                mutex_lock(&data->lock);
                 outb_p(reg, client->addr + IT87_ADDR_REG_OFFSET);
                 res = inb_p(client->addr + IT87_DATA_REG_OFFSET);
-                up(&data->lock);
+                mutex_unlock(&data->lock);
                 return res;
         } else
                 return i2c_smbus_read_byte_data(client, reg);
@@ -969,10 +970,10 @@ static int it87_write_value(struct i2c_client *client, u8 reg, u8 value)
         struct it87_data *data = i2c_get_clientdata(client);
 
         if (i2c_is_isa_client(client)) {
-                down(&data->lock);
+                mutex_lock(&data->lock);
                 outb_p(reg, client->addr + IT87_ADDR_REG_OFFSET);
                 outb_p(value, client->addr + IT87_DATA_REG_OFFSET);
-                up(&data->lock);
+                mutex_unlock(&data->lock);
                 return 0;
         } else
                 return i2c_smbus_write_byte_data(client, reg, value);
@@ -1098,7 +1099,7 @@ static struct it87_data *it87_update_device(struct device *dev)
         struct it87_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) {
@@ -1160,7 +1161,7 @@ static struct it87_data *it87_update_device(struct device *dev)
                 data->valid = 1;
         }
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return data;
 }
diff --git a/drivers/hwmon/lm63.c b/drivers/hwmon/lm63.c
index 6b1aa7ef552e..071f0fc6adec 100644
--- a/drivers/hwmon/lm63.c
+++ b/drivers/hwmon/lm63.c
@@ -45,6 +45,7 @@
 #include <linux/hwmon-sysfs.h>
 #include <linux/hwmon.h>
 #include <linux/err.h>
+#include <linux/mutex.h>
 
 /*
  * Addresses to scan
@@ -153,7 +154,7 @@ static struct i2c_driver lm63_driver = {
 struct lm63_data {
         struct i2c_client client;
         struct class_device *class_dev;
-        struct semaphore update_lock;
+        struct mutex update_lock;
         char valid; /* zero until following fields are valid */
         unsigned long last_updated; /* in jiffies */
 
@@ -192,13 +193,13 @@ static ssize_t set_fan(struct device *dev, struct device_attribute *dummy,
         struct lm63_data *data = i2c_get_clientdata(client);
         unsigned long val = simple_strtoul(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->fan[1] = FAN_TO_REG(val);
         i2c_smbus_write_byte_data(client, LM63_REG_TACH_LIMIT_LSB,
                                   data->fan[1] & 0xFF);
         i2c_smbus_write_byte_data(client, LM63_REG_TACH_LIMIT_MSB,
                                   data->fan[1] >> 8);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -222,12 +223,12 @@ static ssize_t set_pwm1(struct device *dev, struct device_attribute *dummy,
                 return -EPERM;
 
         val = simple_strtoul(buf, NULL, 10);
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->pwm1_value = val <= 0 ? 0 :
                            val >= 255 ? 2 * data->pwm1_freq :
                            (val * data->pwm1_freq * 2 + 127) / 255;
         i2c_smbus_write_byte_data(client, LM63_REG_PWM_VALUE, data->pwm1_value);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -253,10 +254,10 @@ static ssize_t set_temp8(struct device *dev, struct device_attribute *dummy,
         struct lm63_data *data = i2c_get_clientdata(client);
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp8[1] = TEMP8_TO_REG(val);
         i2c_smbus_write_byte_data(client, LM63_REG_LOCAL_HIGH, data->temp8[1]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -284,13 +285,13 @@ static ssize_t set_temp11(struct device *dev, struct device_attribute *devattr,
         long val = simple_strtol(buf, NULL, 10);
         int nr = attr->index;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp11[nr] = TEMP11_TO_REG(val);
         i2c_smbus_write_byte_data(client, reg[(nr - 1) * 2],
                                   data->temp11[nr] >> 8);
         i2c_smbus_write_byte_data(client, reg[(nr - 1) * 2 + 1],
                                   data->temp11[nr] & 0xff);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -314,11 +315,11 @@ static ssize_t set_temp2_crit_hyst(struct device *dev, struct device_attribute *
         long val = simple_strtol(buf, NULL, 10);
         long hyst;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         hyst = TEMP8_FROM_REG(data->temp8[2]) - val;
         i2c_smbus_write_byte_data(client, LM63_REG_REMOTE_TCRIT_HYST,
                                   HYST_TO_REG(hyst));
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -427,7 +428,7 @@ static int lm63_detect(struct i2c_adapter *adapter, int address, int kind)
 
         strlcpy(new_client->name, "lm63", I2C_NAME_SIZE);
         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)))
@@ -530,7 +531,7 @@ static struct lm63_data *lm63_update_device(struct device *dev)
         struct i2c_client *client = to_i2c_client(dev);
         struct lm63_data *data = i2c_get_clientdata(client);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         if (time_after(jiffies, data->last_updated + HZ) || !data->valid) {
                 if (data->config & 0x04) { /* tachometer enabled  */
@@ -582,7 +583,7 @@ static struct lm63_data *lm63_update_device(struct device *dev)
                 data->valid = 1;
         }
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return data;
 }
diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c
index 74ca2c8c61c3..fc25b90ec24a 100644
--- a/drivers/hwmon/lm75.c
+++ b/drivers/hwmon/lm75.c
@@ -25,6 +25,7 @@
 #include <linux/i2c.h>
 #include <linux/hwmon.h>
 #include <linux/err.h>
+#include <linux/mutex.h>
 #include "lm75.h"
 
 
@@ -47,7 +48,7 @@ I2C_CLIENT_INSMOD_1(lm75);
 struct lm75_data {
         struct i2c_client       client;
         struct class_device *class_dev;
-        struct semaphore        update_lock;
+        struct mutex            update_lock;
         char                    valid;          /* !=0 if following fields are valid */
         unsigned long           last_updated;   /* In jiffies */
         u16                     temp_input;     /* Register values */
@@ -91,10 +92,10 @@ static ssize_t set_##value(struct device *dev, struct device_attribute *attr, co
         struct lm75_data *data = i2c_get_clientdata(client);    \
         int temp = simple_strtoul(buf, NULL, 10);               \
                                                                 \
-        down(&data->update_lock);                               \
+        mutex_lock(&data->update_lock);                         \
         data->value = LM75_TEMP_TO_REG(temp);                   \
         lm75_write_value(client, reg, data->value);             \
-        up(&data->update_lock);                                 \
+        mutex_unlock(&data->update_lock);                                       \
         return count;                                           \
 }
 set(temp_max, LM75_REG_TEMP_OS);
@@ -188,7 +189,7 @@ static int lm75_detect(struct i2c_adapter *adapter, int address, int kind)
         /* Fill in the remaining client fields and put it into the global list */
         strlcpy(new_client->name, name, I2C_NAME_SIZE);
         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)))
@@ -264,7 +265,7 @@ static struct lm75_data *lm75_update_device(struct device *dev)
         struct i2c_client *client = to_i2c_client(dev);
         struct lm75_data *data = i2c_get_clientdata(client);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
             || !data->valid) {
@@ -277,7 +278,7 @@ static struct lm75_data *lm75_update_device(struct device *dev)
                 data->valid = 1;
         }
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return data;
 }
diff --git a/drivers/hwmon/lm77.c b/drivers/hwmon/lm77.c
index df9e02aaa70a..459cc977380a 100644
--- a/drivers/hwmon/lm77.c
+++ b/drivers/hwmon/lm77.c
@@ -32,6 +32,7 @@
 #include <linux/i2c.h>
 #include <linux/hwmon.h>
 #include <linux/err.h>
+#include <linux/mutex.h>
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, I2C_CLIENT_END };
@@ -51,7 +52,7 @@ I2C_CLIENT_INSMOD_1(lm77);
 struct lm77_data {
         struct i2c_client       client;
         struct class_device *class_dev;
-        struct semaphore        update_lock;
+        struct mutex            update_lock;
         char                    valid;
         unsigned long           last_updated;   /* In jiffies */
         int                     temp_input;     /* Temperatures */
@@ -139,10 +140,10 @@ static ssize_t set_##value(struct device *dev, struct device_attribute *attr, co
         struct lm77_data *data = i2c_get_clientdata(client);                    \
         long val = simple_strtoul(buf, NULL, 10);                               \
                                                                                 \
-        down(&data->update_lock);                                               \
+        mutex_lock(&data->update_lock);                                         \
         data->value = val;                              \
         lm77_write_value(client, reg, LM77_TEMP_TO_REG(data->value));           \
-        up(&data->update_lock);                                                 \
+        mutex_unlock(&data->update_lock);                                       \
         return count;                                                           \
 }
 
@@ -157,11 +158,11 @@ static ssize_t set_temp_crit_hyst(struct device *dev, struct device_attribute *a
         struct lm77_data *data = i2c_get_clientdata(client);
         unsigned long val = simple_strtoul(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp_hyst = data->temp_crit - val;
         lm77_write_value(client, LM77_REG_TEMP_HYST,
                          LM77_TEMP_TO_REG(data->temp_hyst));
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -173,7 +174,7 @@ static ssize_t set_temp_crit(struct device *dev, struct device_attribute *attr,
         long val = simple_strtoul(buf, NULL, 10);
         int oldcrithyst;
         
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         oldcrithyst = data->temp_crit - data->temp_hyst;
         data->temp_crit = val;
         data->temp_hyst = data->temp_crit - oldcrithyst;
@@ -181,7 +182,7 @@ static ssize_t set_temp_crit(struct device *dev, struct device_attribute *attr,
                          LM77_TEMP_TO_REG(data->temp_crit));
         lm77_write_value(client, LM77_REG_TEMP_HYST,
                          LM77_TEMP_TO_REG(data->temp_hyst));
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -306,7 +307,7 @@ static int lm77_detect(struct i2c_adapter *adapter, int address, int kind)
         /* Fill in the remaining client fields and put it into the global list */
         strlcpy(new_client->name, name, I2C_NAME_SIZE);
         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)))
@@ -380,7 +381,7 @@ static struct lm77_data *lm77_update_device(struct device *dev)
         struct i2c_client *client = to_i2c_client(dev);
         struct lm77_data *data = i2c_get_clientdata(client);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
             || !data->valid) {
@@ -406,7 +407,7 @@ static struct lm77_data *lm77_update_device(struct device *dev)
                 data->valid = 1;
         }
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return data;
 }
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c
index e404001e20da..36d1192ebe2a 100644
--- a/drivers/hwmon/lm78.c
+++ b/drivers/hwmon/lm78.c
@@ -27,6 +27,7 @@
 #include <linux/hwmon.h>
 #include <linux/hwmon-vid.h>
 #include <linux/err.h>
+#include <linux/mutex.h>
 #include <asm/io.h>
 
 /* Addresses to scan */
@@ -131,10 +132,10 @@ static inline int TEMP_FROM_REG(s8 val)
 struct lm78_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 */
 
@@ -207,10 +208,10 @@ static ssize_t set_in_min(struct device *dev, const char *buf,
         struct lm78_data *data = i2c_get_clientdata(client);
         unsigned long val = simple_strtoul(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->in_min[nr] = IN_TO_REG(val);
         lm78_write_value(client, LM78_REG_IN_MIN(nr), data->in_min[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -221,10 +222,10 @@ static ssize_t set_in_max(struct device *dev, const char *buf,
         struct lm78_data *data = i2c_get_clientdata(client);
         unsigned long val = simple_strtoul(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->in_max[nr] = IN_TO_REG(val);
         lm78_write_value(client, LM78_REG_IN_MAX(nr), data->in_max[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
         
@@ -288,10 +289,10 @@ static ssize_t set_temp_over(struct device *dev, struct device_attribute *attr,
         struct lm78_data *data = i2c_get_clientdata(client);
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp_over = TEMP_TO_REG(val);
         lm78_write_value(client, LM78_REG_TEMP_OVER, data->temp_over);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -307,10 +308,10 @@ static ssize_t set_temp_hyst(struct device *dev, struct device_attribute *attr,
         struct lm78_data *data = i2c_get_clientdata(client);
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp_hyst = TEMP_TO_REG(val);
         lm78_write_value(client, LM78_REG_TEMP_HYST, data->temp_hyst);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -342,10 +343,10 @@ static ssize_t set_fan_min(struct device *dev, const char *buf,
         struct lm78_data *data = i2c_get_clientdata(client);
         unsigned long val = simple_strtoul(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->fan_min[nr] = FAN_TO_REG(val, DIV_FROM_REG(data->fan_div[nr]));
         lm78_write_value(client, LM78_REG_FAN_MIN(nr), data->fan_min[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -368,7 +369,7 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
         unsigned long min;
         u8 reg;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         min = FAN_FROM_REG(data->fan_min[nr],
                            DIV_FROM_REG(data->fan_div[nr]));
 
@@ -380,7 +381,7 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
         default:
                 dev_err(&client->dev, "fan_div value %ld not "
                         "supported. Choose one of 1, 2, 4 or 8!\n", val);
-                up(&data->update_lock);
+                mutex_unlock(&data->update_lock);
                 return -EINVAL;
         }
 
@@ -398,7 +399,7 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
         data->fan_min[nr] =
                 FAN_TO_REG(min, DIV_FROM_REG(data->fan_div[nr]));
         lm78_write_value(client, LM78_REG_FAN_MIN(nr), data->fan_min[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return count;
 }
@@ -548,7 +549,7 @@ static int lm78_detect(struct i2c_adapter *adapter, int address, int kind)
 
         new_client = &data->client;
         if (is_isa)
-                init_MUTEX(&data->lock);
+                mutex_init(&data->lock);
         i2c_set_clientdata(new_client, data);
         new_client->addr = address;
         new_client->adapter = adapter;
@@ -598,7 +599,7 @@ static int lm78_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)))
@@ -697,10 +698,10 @@ static int lm78_read_value(struct i2c_client *client, u8 reg)
         int res;
         if (i2c_is_isa_client(client)) {
                 struct lm78_data *data = i2c_get_clientdata(client);
-                down(&data->lock);
+                mutex_lock(&data->lock);
                 outb_p(reg, client->addr + LM78_ADDR_REG_OFFSET);
                 res = inb_p(client->addr + LM78_DATA_REG_OFFSET);
-                up(&data->lock);
+                mutex_unlock(&data->lock);
                 return res;
         } else
                 return i2c_smbus_read_byte_data(client, reg);
@@ -717,10 +718,10 @@ static int lm78_write_value(struct i2c_client *client, u8 reg, u8 value)
 {
         if (i2c_is_isa_client(client)) {
                 struct lm78_data *data = i2c_get_clientdata(client);
-                down(&data->lock);
+                mutex_lock(&data->lock);
                 outb_p(reg, client->addr + LM78_ADDR_REG_OFFSET);
                 outb_p(value, client->addr + LM78_DATA_REG_OFFSET);
-                up(&data->lock);
+                mutex_unlock(&data->lock);
                 return 0;
         } else
                 return i2c_smbus_write_byte_data(client, reg, value);
@@ -742,7 +743,7 @@ static struct lm78_data *lm78_update_device(struct device *dev)
         struct lm78_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) {
@@ -786,7 +787,7 @@ static struct lm78_data *lm78_update_device(struct device *dev)
                 data->fan_div[2] = 1;
         }
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return data;
 }
diff --git a/drivers/hwmon/lm80.c b/drivers/hwmon/lm80.c
index c9a7cdea7bd7..f72120d08c4c 100644
--- a/drivers/hwmon/lm80.c
+++ b/drivers/hwmon/lm80.c
@@ -28,6 +28,7 @@
 #include <linux/i2c.h>
 #include <linux/hwmon.h>
 #include <linux/err.h>
+#include <linux/mutex.h>
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c,
@@ -108,7 +109,7 @@ static inline long TEMP_FROM_REG(u16 temp)
 struct lm80_data {
         struct i2c_client client;
         struct class_device *class_dev;
-        struct semaphore update_lock;
+        struct mutex update_lock;
         char valid;             /* !=0 if following fields are valid */
         unsigned long last_updated;     /* In jiffies */
 
@@ -191,10 +192,10 @@ static ssize_t set_in_##suffix(struct device *dev, struct device_attribute *attr
         struct lm80_data *data = i2c_get_clientdata(client); \
         long val = simple_strtol(buf, NULL, 10); \
  \
-        down(&data->update_lock);\
+        mutex_lock(&data->update_lock);\
         data->value = IN_TO_REG(val); \
         lm80_write_value(client, reg, data->value); \
-        up(&data->update_lock);\
+        mutex_unlock(&data->update_lock);\
         return count; \
 }
 set_in(min0, in_min[0], LM80_REG_IN_MIN(0));
@@ -241,10 +242,10 @@ static ssize_t set_fan_##suffix(struct device *dev, struct device_attribute *att
         struct lm80_data *data = i2c_get_clientdata(client); \
         long val = simple_strtoul(buf, NULL, 10); \
  \
-        down(&data->update_lock);\
+        mutex_lock(&data->update_lock);\
         data->value = FAN_TO_REG(val, DIV_FROM_REG(data->div)); \
         lm80_write_value(client, reg, data->value); \
-        up(&data->update_lock);\
+        mutex_unlock(&data->update_lock);\
         return count; \
 }
 set_fan(min1, fan_min[0], LM80_REG_FAN_MIN(1), fan_div[0]);
@@ -263,7 +264,7 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
         u8 reg;
 
         /* Save fan_min */
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         min = FAN_FROM_REG(data->fan_min[nr],
                            DIV_FROM_REG(data->fan_div[nr]));
 
@@ -275,7 +276,7 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
         default:
                 dev_err(&client->dev, "fan_div value %ld not "
                         "supported. Choose one of 1, 2, 4 or 8!\n", val);
-                up(&data->update_lock);
+                mutex_unlock(&data->update_lock);
                 return -EINVAL;
         }
 
@@ -286,7 +287,7 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
         /* Restore fan_min */
         data->fan_min[nr] = FAN_TO_REG(min, DIV_FROM_REG(data->fan_div[nr]));
         lm80_write_value(client, LM80_REG_FAN_MIN(nr + 1), data->fan_min[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return count;
 }
@@ -325,10 +326,10 @@ static ssize_t set_temp_##suffix(struct device *dev, struct device_attribute *at
         struct lm80_data *data = i2c_get_clientdata(client); \
         long val = simple_strtoul(buf, NULL, 10); \
  \
-        down(&data->update_lock); \
+        mutex_lock(&data->update_lock); \
         data->value = TEMP_LIMIT_TO_REG(val); \
         lm80_write_value(client, reg, data->value); \
-        up(&data->update_lock); \
+        mutex_unlock(&data->update_lock); \
         return count; \
 }
 set_temp(hot_max, temp_hot_max, LM80_REG_TEMP_HOT_MAX);
@@ -437,7 +438,7 @@ static int lm80_detect(struct i2c_adapter *adapter, int address, int kind)
         /* Fill in the remaining client fields and put it into the global list */
         strlcpy(new_client->name, name, I2C_NAME_SIZE);
         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)))
@@ -545,7 +546,7 @@ static struct lm80_data *lm80_update_device(struct device *dev)
         struct lm80_data *data = i2c_get_clientdata(client);
         int i;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         if (time_after(jiffies, data->last_updated + 2 * HZ) || !data->valid) {
                 dev_dbg(&client->dev, "Starting lm80 update\n");
@@ -585,7 +586,7 @@ static struct lm80_data *lm80_update_device(struct device *dev)
                 data->valid = 1;
         }
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return data;
 }
diff --git a/drivers/hwmon/lm83.c b/drivers/hwmon/lm83.c
index 26dfa9e216c2..aac4ec2bf694 100644
--- a/drivers/hwmon/lm83.c
+++ b/drivers/hwmon/lm83.c
@@ -35,6 +35,7 @@
 #include <linux/hwmon-sysfs.h>
 #include <linux/hwmon.h>
 #include <linux/err.h>
+#include <linux/mutex.h>
 
 /*
  * Addresses to scan
@@ -139,7 +140,7 @@ static struct i2c_driver lm83_driver = {
 struct lm83_data {
         struct i2c_client client;
         struct class_device *class_dev;
-        struct semaphore update_lock;
+        struct mutex update_lock;
         char valid; /* zero until following fields are valid */
         unsigned long last_updated; /* in jiffies */
 
@@ -171,11 +172,11 @@ static ssize_t set_temp(struct device *dev, struct device_attribute *devattr,
         long val = simple_strtol(buf, NULL, 10);
         int nr = attr->index;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp[nr] = TEMP_TO_REG(val);
         i2c_smbus_write_byte_data(client, LM83_REG_W_HIGH[nr - 4],
                                   data->temp[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -300,7 +301,7 @@ static int lm83_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);
         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)))
@@ -373,7 +374,7 @@ static struct lm83_data *lm83_update_device(struct device *dev)
         struct i2c_client *client = to_i2c_client(dev);
         struct lm83_data *data = i2c_get_clientdata(client);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         if (time_after(jiffies, data->last_updated + HZ * 2) || !data->valid) {
                 int nr;
@@ -393,7 +394,7 @@ static struct lm83_data *lm83_update_device(struct device *dev)
                 data->valid = 1;
         }
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return data;
 }
diff --git a/drivers/hwmon/lm85.c b/drivers/hwmon/lm85.c
index 7389a0127547..095e58ac2ceb 100644
--- a/drivers/hwmon/lm85.c
+++ b/drivers/hwmon/lm85.c
@@ -31,6 +31,7 @@
 #include <linux/hwmon.h>
 #include <linux/hwmon-vid.h>
 #include <linux/err.h>
+#include <linux/mutex.h>
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
@@ -331,10 +332,10 @@ struct lm85_autofan {
 struct lm85_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;
         int valid;              /* !=0 if following fields are valid */
         unsigned long last_reading;     /* In jiffies */
         unsigned long last_config;      /* In jiffies */
@@ -407,10 +408,10 @@ static ssize_t set_fan_min(struct device *dev, const char *buf,
         struct lm85_data *data = i2c_get_clientdata(client);
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->fan_min[nr] = FAN_TO_REG(val);
         lm85_write_value(client, LM85_REG_FAN_MIN(nr), data->fan_min[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -499,10 +500,10 @@ static ssize_t set_pwm(struct device *dev, const char *buf,
         struct lm85_data *data = i2c_get_clientdata(client);
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->pwm[nr] = PWM_TO_REG(val);
         lm85_write_value(client, LM85_REG_PWM(nr), data->pwm[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 static ssize_t show_pwm_enable(struct device *dev, char *buf, int nr)
@@ -559,10 +560,10 @@ static ssize_t set_in_min(struct device *dev, const char *buf,
         struct lm85_data *data = i2c_get_clientdata(client);
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->in_min[nr] = INS_TO_REG(nr, val);
         lm85_write_value(client, LM85_REG_IN_MIN(nr), data->in_min[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 static ssize_t show_in_max(struct device *dev, char *buf, int nr)
@@ -577,10 +578,10 @@ static ssize_t set_in_max(struct device *dev, const char *buf,
         struct lm85_data *data = i2c_get_clientdata(client);
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->in_max[nr] = INS_TO_REG(nr, val);
         lm85_write_value(client, LM85_REG_IN_MAX(nr), data->in_max[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 #define show_in_reg(offset)                                             \
@@ -640,10 +641,10 @@ static ssize_t set_temp_min(struct device *dev, const char *buf,
         struct lm85_data *data = i2c_get_clientdata(client);
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp_min[nr] = TEMP_TO_REG(val);
         lm85_write_value(client, LM85_REG_TEMP_MIN(nr), data->temp_min[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 static ssize_t show_temp_max(struct device *dev, char *buf, int nr)
@@ -658,10 +659,10 @@ static ssize_t set_temp_max(struct device *dev, const char *buf,
         struct lm85_data *data = i2c_get_clientdata(client);
         long val = simple_strtol(buf, NULL, 10);        
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp_max[nr] = TEMP_TO_REG(val);
         lm85_write_value(client, LM85_REG_TEMP_MAX(nr), data->temp_max[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 #define show_temp_reg(offset)                                           \
@@ -713,12 +714,12 @@ static ssize_t set_pwm_auto_channels(struct device *dev, const char *buf,
         struct lm85_data *data = i2c_get_clientdata(client);
         long val = simple_strtol(buf, NULL, 10);   
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->autofan[nr].config = (data->autofan[nr].config & (~0xe0))
                 | ZONE_TO_REG(val) ;
         lm85_write_value(client, LM85_REG_AFAN_CONFIG(nr),
                 data->autofan[nr].config);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 static ssize_t show_pwm_auto_pwm_min(struct device *dev, char *buf, int nr)
@@ -733,11 +734,11 @@ static ssize_t set_pwm_auto_pwm_min(struct device *dev, const char *buf,
         struct lm85_data *data = i2c_get_clientdata(client);
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->autofan[nr].min_pwm = PWM_TO_REG(val);
         lm85_write_value(client, LM85_REG_AFAN_MINPWM(nr),
                 data->autofan[nr].min_pwm);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 static ssize_t show_pwm_auto_pwm_minctl(struct device *dev, char *buf, int nr)
@@ -752,7 +753,7 @@ static ssize_t set_pwm_auto_pwm_minctl(struct device *dev, const char *buf,
         struct lm85_data *data = i2c_get_clientdata(client);
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->autofan[nr].min_off = val;
         lm85_write_value(client, LM85_REG_AFAN_SPIKE1, data->smooth[0]
                 | data->syncpwm3
@@ -760,7 +761,7 @@ static ssize_t set_pwm_auto_pwm_minctl(struct device *dev, const char *buf,
                 | (data->autofan[1].min_off ? 0x40 : 0)
                 | (data->autofan[2].min_off ? 0x80 : 0)
         );
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 static ssize_t show_pwm_auto_pwm_freq(struct device *dev, char *buf, int nr)
@@ -775,13 +776,13 @@ static ssize_t set_pwm_auto_pwm_freq(struct device *dev, const char *buf,
         struct lm85_data *data = i2c_get_clientdata(client);
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->autofan[nr].freq = FREQ_TO_REG(val);
         lm85_write_value(client, LM85_REG_AFAN_RANGE(nr),
                 (data->zone[nr].range << 4)
                 | data->autofan[nr].freq
         ); 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 #define pwm_auto(offset)                                                \
@@ -857,7 +858,7 @@ static ssize_t set_temp_auto_temp_off(struct device *dev, const char *buf,
         int min;
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         min = TEMP_FROM_REG(data->zone[nr].limit);
         data->zone[nr].off_desired = TEMP_TO_REG(val);
         data->zone[nr].hyst = HYST_TO_REG(min - val);
@@ -871,7 +872,7 @@ static ssize_t set_temp_auto_temp_off(struct device *dev, const char *buf,
                         (data->zone[2].hyst << 4)
                 );
         }
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 static ssize_t show_temp_auto_temp_min(struct device *dev, char *buf, int nr)
@@ -886,7 +887,7 @@ static ssize_t set_temp_auto_temp_min(struct device *dev, const char *buf,
         struct lm85_data *data = i2c_get_clientdata(client);
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->zone[nr].limit = TEMP_TO_REG(val);
         lm85_write_value(client, LM85_REG_AFAN_LIMIT(nr),
                 data->zone[nr].limit);
@@ -913,7 +914,7 @@ static ssize_t set_temp_auto_temp_min(struct device *dev, const char *buf,
                         (data->zone[2].hyst << 4)
                 );
         }
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 static ssize_t show_temp_auto_temp_max(struct device *dev, char *buf, int nr)
@@ -930,7 +931,7 @@ static ssize_t set_temp_auto_temp_max(struct device *dev, const char *buf,
         int min;
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         min = TEMP_FROM_REG(data->zone[nr].limit);
         data->zone[nr].max_desired = TEMP_TO_REG(val);
         data->zone[nr].range = RANGE_TO_REG(
@@ -938,7 +939,7 @@ static ssize_t set_temp_auto_temp_max(struct device *dev, const char *buf,
         lm85_write_value(client, LM85_REG_AFAN_RANGE(nr),
                 ((data->zone[nr].range & 0x0f) << 4)
                 | (data->autofan[nr].freq & 0x07));
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 static ssize_t show_temp_auto_temp_crit(struct device *dev, char *buf, int nr)
@@ -953,11 +954,11 @@ static ssize_t set_temp_auto_temp_crit(struct device *dev, const char *buf,
         struct lm85_data *data = i2c_get_clientdata(client);
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->zone[nr].critical = TEMP_TO_REG(val);
         lm85_write_value(client, LM85_REG_AFAN_CRITICAL(nr),
                 data->zone[nr].critical);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 #define temp_auto(offset)                                               \
@@ -1149,7 +1150,7 @@ static int lm85_detect(struct i2c_adapter *adapter, int address,
         /* Fill in the remaining client fields */
         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)))
@@ -1368,7 +1369,7 @@ static struct lm85_data *lm85_update_device(struct device *dev)
         struct lm85_data *data = i2c_get_clientdata(client);
         int i;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         if ( !data->valid ||
              time_after(jiffies, data->last_reading + LM85_DATA_INTERVAL) ) {
@@ -1571,7 +1572,7 @@ static struct lm85_data *lm85_update_device(struct device *dev)
 
         data->valid = 1;
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return data;
 }
diff --git a/drivers/hwmon/lm87.c b/drivers/hwmon/lm87.c
index 6ba34c302d8d..e229daf666de 100644
--- a/drivers/hwmon/lm87.c
+++ b/drivers/hwmon/lm87.c
@@ -60,6 +60,7 @@
 #include <linux/hwmon.h>
 #include <linux/hwmon-vid.h>
 #include <linux/err.h>
+#include <linux/mutex.h>
 
 /*
  * Addresses to scan
@@ -176,7 +177,7 @@ static struct i2c_driver lm87_driver = {
 struct lm87_data {
         struct i2c_client client;
         struct class_device *class_dev;
-        struct semaphore update_lock;
+        struct mutex update_lock;
         char valid; /* zero until following fields are valid */
         unsigned long last_updated; /* In jiffies */
 
@@ -253,11 +254,11 @@ static void set_in_min(struct device *dev, const char *buf, int nr)
         struct lm87_data *data = i2c_get_clientdata(client);
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->in_min[nr] = IN_TO_REG(val, data->in_scale[nr]);
         lm87_write_value(client, nr<6 ? LM87_REG_IN_MIN(nr) :
                          LM87_REG_AIN_MIN(nr-6), data->in_min[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 }
 
 static void set_in_max(struct device *dev, const char *buf, int nr)
@@ -266,11 +267,11 @@ static void set_in_max(struct device *dev, const char *buf, int nr)
         struct lm87_data *data = i2c_get_clientdata(client);
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->in_max[nr] = IN_TO_REG(val, data->in_scale[nr]);
         lm87_write_value(client, nr<6 ? LM87_REG_IN_MAX(nr) :
                          LM87_REG_AIN_MAX(nr-6), data->in_max[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 }
 
 #define set_in(offset) \
@@ -327,10 +328,10 @@ static void set_temp_low(struct device *dev, const char *buf, int nr)
         struct lm87_data *data = i2c_get_clientdata(client);
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp_low[nr] = TEMP_TO_REG(val);
         lm87_write_value(client, LM87_REG_TEMP_LOW[nr], data->temp_low[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 }
 
 static void set_temp_high(struct device *dev, const char *buf, int nr)
@@ -339,10 +340,10 @@ static void set_temp_high(struct device *dev, const char *buf, int nr)
         struct lm87_data *data = i2c_get_clientdata(client);
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp_high[nr] = TEMP_TO_REG(val);
         lm87_write_value(client, LM87_REG_TEMP_HIGH[nr], data->temp_high[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 }
 
 #define set_temp(offset) \
@@ -411,11 +412,11 @@ static void set_fan_min(struct device *dev, const char *buf, int nr)
         struct lm87_data *data = i2c_get_clientdata(client);
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->fan_min[nr] = FAN_TO_REG(val,
                             FAN_DIV_FROM_REG(data->fan_div[nr]));
         lm87_write_value(client, LM87_REG_FAN_MIN(nr), data->fan_min[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 }
 
 /* Note: we save and restore the fan minimum here, because its value is
@@ -431,7 +432,7 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
         unsigned long min;
         u8 reg;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         min = FAN_FROM_REG(data->fan_min[nr],
                            FAN_DIV_FROM_REG(data->fan_div[nr]));
 
@@ -441,7 +442,7 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
         case 4: data->fan_div[nr] = 2; break;
         case 8: data->fan_div[nr] = 3; break;
         default:
-                up(&data->update_lock);
+                mutex_unlock(&data->update_lock);
                 return -EINVAL;
         }
 
@@ -459,7 +460,7 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
         data->fan_min[nr] = FAN_TO_REG(min, val);
         lm87_write_value(client, LM87_REG_FAN_MIN(nr),
                          data->fan_min[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return count;
 }
@@ -522,10 +523,10 @@ static ssize_t set_aout(struct device *dev, struct device_attribute *attr, const
         struct lm87_data *data = i2c_get_clientdata(client);
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->aout = AOUT_TO_REG(val);
         lm87_write_value(client, LM87_REG_AOUT, data->aout);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 static DEVICE_ATTR(aout_output, S_IRUGO | S_IWUSR, show_aout, set_aout);
@@ -589,7 +590,7 @@ static int lm87_detect(struct i2c_adapter *adapter, int address, int kind)
         /* We can fill in the remaining client fields */
         strlcpy(new_client->name, "lm87", I2C_NAME_SIZE);
         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)))
@@ -744,7 +745,7 @@ static struct lm87_data *lm87_update_device(struct device *dev)
         struct i2c_client *client = to_i2c_client(dev);
         struct lm87_data *data = i2c_get_clientdata(client);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         if (time_after(jiffies, data->last_updated + HZ) || !data->valid) {
                 int i, j;
@@ -813,7 +814,7 @@ static struct lm87_data *lm87_update_device(struct device *dev)
                 data->valid = 1;
         }
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return data;
 }
diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
index 5679464447cc..d9eeaf7585bd 100644
--- a/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@ -78,6 +78,7 @@
 #include <linux/hwmon-sysfs.h>
 #include <linux/hwmon.h>
 #include <linux/err.h>
+#include <linux/mutex.h>
 
 /*
  * Addresses to scan
@@ -201,7 +202,7 @@ static struct i2c_driver lm90_driver = {
 struct lm90_data {
         struct i2c_client client;
         struct class_device *class_dev;
-        struct semaphore update_lock;
+        struct mutex update_lock;
         char valid; /* zero until following fields are valid */
         unsigned long last_updated; /* in jiffies */
         int kind;
@@ -247,13 +248,13 @@ static ssize_t set_temp8(struct device *dev, struct device_attribute *devattr,
         long val = simple_strtol(buf, NULL, 10);
         int nr = attr->index;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         if (data->kind == adt7461)
                 data->temp8[nr] = TEMP1_TO_REG_ADT7461(val);
         else
                 data->temp8[nr] = TEMP1_TO_REG(val);
         i2c_smbus_write_byte_data(client, reg[nr - 1], data->temp8[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -281,7 +282,7 @@ static ssize_t set_temp11(struct device *dev, struct device_attribute *devattr,
         long val = simple_strtol(buf, NULL, 10);
         int nr = attr->index;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         if (data->kind == adt7461)
                 data->temp11[nr] = TEMP2_TO_REG_ADT7461(val);
         else
@@ -290,7 +291,7 @@ static ssize_t set_temp11(struct device *dev, struct device_attribute *devattr,
                                   data->temp11[nr] >> 8);
         i2c_smbus_write_byte_data(client, reg[(nr - 1) * 2 + 1],
                                   data->temp11[nr] & 0xff);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -311,11 +312,11 @@ static ssize_t set_temphyst(struct device *dev, struct device_attribute *dummy,
         long val = simple_strtol(buf, NULL, 10);
         long hyst;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         hyst = TEMP1_FROM_REG(data->temp8[3]) - val;
         i2c_smbus_write_byte_data(client, LM90_REG_W_TCRIT_HYST,
                                   HYST_TO_REG(hyst));
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -558,7 +559,7 @@ static int lm90_detect(struct i2c_adapter *adapter, int address, int kind)
         strlcpy(new_client->name, name, I2C_NAME_SIZE);
         data->valid = 0;
         data->kind = kind;
-        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)))
@@ -646,7 +647,7 @@ static struct lm90_data *lm90_update_device(struct device *dev)
         struct i2c_client *client = to_i2c_client(dev);
         struct lm90_data *data = i2c_get_clientdata(client);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         if (time_after(jiffies, data->last_updated + HZ * 2) || !data->valid) {
                 u8 oldh, newh, l;
@@ -692,7 +693,7 @@ static struct lm90_data *lm90_update_device(struct device *dev)
                 data->valid = 1;
         }
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return data;
 }
diff --git a/drivers/hwmon/lm92.c b/drivers/hwmon/lm92.c
index b0c4cb730a7e..197f77226dc4 100644
--- a/drivers/hwmon/lm92.c
+++ b/drivers/hwmon/lm92.c
@@ -46,6 +46,7 @@
 #include <linux/i2c.h>
 #include <linux/hwmon.h>
 #include <linux/err.h>
+#include <linux/mutex.h>
 
 /* The LM92 and MAX6635 have 2 two-state pins for address selection,
    resulting in 4 possible addresses. */
@@ -96,7 +97,7 @@ static struct i2c_driver lm92_driver;
 struct lm92_data {
         struct i2c_client client;
         struct class_device *class_dev;
-        struct semaphore update_lock;
+        struct mutex update_lock;
         char valid; /* zero until following fields are valid */
         unsigned long last_updated; /* in jiffies */
 
@@ -114,7 +115,7 @@ static struct lm92_data *lm92_update_device(struct device *dev)
         struct i2c_client *client = to_i2c_client(dev);
         struct lm92_data *data = i2c_get_clientdata(client);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         if (time_after(jiffies, data->last_updated + HZ)
          || !data->valid) {
@@ -134,7 +135,7 @@ static struct lm92_data *lm92_update_device(struct device *dev)
                 data->valid = 1;
         }
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return data;
 }
@@ -158,10 +159,10 @@ static ssize_t set_##value(struct device *dev, struct device_attribute *attr, co
         struct lm92_data *data = i2c_get_clientdata(client); \
         long val = simple_strtol(buf, NULL, 10); \
  \
-        down(&data->update_lock); \
+        mutex_lock(&data->update_lock); \
         data->value = TEMP_TO_REG(val); \
         i2c_smbus_write_word_data(client, reg, swab16(data->value)); \
-        up(&data->update_lock); \
+        mutex_unlock(&data->update_lock); \
         return count; \
 }
 set_temp(temp1_crit, LM92_REG_TEMP_CRIT);
@@ -194,11 +195,11 @@ static ssize_t set_temp1_crit_hyst(struct device *dev, struct device_attribute *
         struct lm92_data *data = i2c_get_clientdata(client);
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp1_hyst = TEMP_FROM_REG(data->temp1_crit) - val;
         i2c_smbus_write_word_data(client, LM92_REG_TEMP_HYST,
                                   swab16(TEMP_TO_REG(data->temp1_hyst)));
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -348,7 +349,7 @@ static int lm92_detect(struct i2c_adapter *adapter, int address, int kind)
         /* Fill in the remaining client fields */
         strlcpy(new_client->name, name, I2C_NAME_SIZE);
         data->valid = 0;
-        init_MUTEX(&data->update_lock);
+        mutex_init(&data->update_lock);
 
         /* Tell the i2c subsystem a new client has arrived */
         if ((err = i2c_attach_client(new_client)))
diff --git a/drivers/hwmon/max1619.c b/drivers/hwmon/max1619.c
index 3abe330b22ce..b4135b5971f4 100644
--- a/drivers/hwmon/max1619.c
+++ b/drivers/hwmon/max1619.c
@@ -33,6 +33,7 @@
 #include <linux/i2c.h>
 #include <linux/hwmon.h>
 #include <linux/err.h>
+#include <linux/mutex.h>
 
 static unsigned short normal_i2c[] = { 0x18, 0x19, 0x1a,
                                         0x29, 0x2a, 0x2b,
@@ -104,7 +105,7 @@ static struct i2c_driver max1619_driver = {
 struct max1619_data {
         struct i2c_client client;
         struct class_device *class_dev;
-        struct semaphore update_lock;
+        struct mutex update_lock;
         char valid; /* zero until following fields are valid */
         unsigned long last_updated; /* in jiffies */
 
@@ -141,10 +142,10 @@ static ssize_t set_##value(struct device *dev, struct device_attribute *attr, co
         struct max1619_data *data = i2c_get_clientdata(client); \
         long val = simple_strtol(buf, NULL, 10); \
  \
-        down(&data->update_lock); \
+        mutex_lock(&data->update_lock); \
         data->value = TEMP_TO_REG(val); \
         i2c_smbus_write_byte_data(client, reg, data->value); \
-        up(&data->update_lock); \
+        mutex_unlock(&data->update_lock); \
         return count; \
 }
 
@@ -262,7 +263,7 @@ static int max1619_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);
         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)))
@@ -330,7 +331,7 @@ static struct max1619_data *max1619_update_device(struct device *dev)
         struct i2c_client *client = to_i2c_client(dev);
         struct max1619_data *data = i2c_get_clientdata(client);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         if (time_after(jiffies, data->last_updated + HZ * 2) || !data->valid) {
                 dev_dbg(&client->dev, "Updating max1619 data.\n");
@@ -353,7 +354,7 @@ static struct max1619_data *max1619_update_device(struct device *dev)
                 data->valid = 1;
         }
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return data;
 }
diff --git a/drivers/hwmon/pc87360.c b/drivers/hwmon/pc87360.c
index 2de69322f525..ae05e483a778 100644
--- a/drivers/hwmon/pc87360.c
+++ b/drivers/hwmon/pc87360.c
@@ -43,6 +43,7 @@
 #include <linux/hwmon-sysfs.h>
 #include <linux/hwmon-vid.h>
 #include <linux/err.h>
+#include <linux/mutex.h>
 #include <asm/io.h>
 
 static u8 devid;
@@ -183,8 +184,8 @@ static inline u8 PWM_TO_REG(int val, int inv)
 struct pc87360_data {
         struct i2c_client client;
         struct class_device *class_dev;
-        struct semaphore lock;
-        struct semaphore update_lock;
+        struct mutex lock;
+        struct mutex update_lock;
         char valid;             /* !=0 if following fields are valid */
         unsigned long last_updated;     /* In jiffies */
 
@@ -283,7 +284,7 @@ static ssize_t set_fan_min(struct device *dev, struct device_attribute *devattr,
         struct pc87360_data *data = i2c_get_clientdata(client);
         long fan_min = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         fan_min = FAN_TO_REG(fan_min, FAN_DIV_FROM_REG(data->fan_status[attr->index]));
 
         /* If it wouldn't fit, change clock divisor */
@@ -300,7 +301,7 @@ static ssize_t set_fan_min(struct device *dev, struct device_attribute *devattr,
         /* Write new divider, preserve alarm bits */
         pc87360_write_value(data, LD_FAN, NO_BANK, PC87360_REG_FAN_STATUS(attr->index),
                             data->fan_status[attr->index] & 0xF9);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return count;
 }
@@ -343,12 +344,12 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *devattr, con
         struct pc87360_data *data = i2c_get_clientdata(client);
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->pwm[attr->index] = PWM_TO_REG(val,
                               FAN_CONFIG_INVERT(data->fan_conf, attr->index));
         pc87360_write_value(data, LD_FAN, NO_BANK, PC87360_REG_PWM(attr->index),
                             data->pwm[attr->index]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -393,11 +394,11 @@ static ssize_t set_in_min(struct device *dev, struct device_attribute *devattr,
         struct pc87360_data *data = i2c_get_clientdata(client);
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->in_min[attr->index] = IN_TO_REG(val, data->in_vref);
         pc87360_write_value(data, LD_IN, attr->index, PC87365_REG_IN_MIN,
                             data->in_min[attr->index]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 static ssize_t set_in_max(struct device *dev, struct device_attribute *devattr, const char *buf,
@@ -408,12 +409,12 @@ static ssize_t set_in_max(struct device *dev, struct device_attribute *devattr,
         struct pc87360_data *data = i2c_get_clientdata(client);
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->in_max[attr->index] = IN_TO_REG(val,
                                data->in_vref);
         pc87360_write_value(data, LD_IN, attr->index, PC87365_REG_IN_MAX,
                             data->in_max[attr->index]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -512,11 +513,11 @@ static ssize_t set_therm_min(struct device *dev, struct device_attribute *devatt
         struct pc87360_data *data = i2c_get_clientdata(client);
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->in_min[attr->index] = IN_TO_REG(val, data->in_vref);
         pc87360_write_value(data, LD_IN, attr->index, PC87365_REG_TEMP_MIN,
                             data->in_min[attr->index]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 static ssize_t set_therm_max(struct device *dev, struct device_attribute *devattr, const char *buf,
@@ -527,11 +528,11 @@ static ssize_t set_therm_max(struct device *dev, struct device_attribute *devatt
         struct pc87360_data *data = i2c_get_clientdata(client);
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->in_max[attr->index] = IN_TO_REG(val, data->in_vref);
         pc87360_write_value(data, LD_IN, attr->index, PC87365_REG_TEMP_MAX,
                             data->in_max[attr->index]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 static ssize_t set_therm_crit(struct device *dev, struct device_attribute *devattr, const char *buf,
@@ -542,11 +543,11 @@ static ssize_t set_therm_crit(struct device *dev, struct device_attribute *devat
         struct pc87360_data *data = i2c_get_clientdata(client);
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->in_crit[attr->index-11] = IN_TO_REG(val, data->in_vref);
         pc87360_write_value(data, LD_IN, attr->index, PC87365_REG_TEMP_CRIT,
                             data->in_crit[attr->index-11]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -654,11 +655,11 @@ static ssize_t set_temp_min(struct device *dev, struct device_attribute *devattr
         struct pc87360_data *data = i2c_get_clientdata(client);
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp_min[attr->index] = TEMP_TO_REG(val);
         pc87360_write_value(data, LD_TEMP, attr->index, PC87365_REG_TEMP_MIN,
                             data->temp_min[attr->index]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 static ssize_t set_temp_max(struct device *dev, struct device_attribute *devattr, const char *buf,
@@ -669,11 +670,11 @@ static ssize_t set_temp_max(struct device *dev, struct device_attribute *devattr
         struct pc87360_data *data = i2c_get_clientdata(client);
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp_max[attr->index] = TEMP_TO_REG(val);
         pc87360_write_value(data, LD_TEMP, attr->index, PC87365_REG_TEMP_MAX,
                             data->temp_max[attr->index]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 static ssize_t set_temp_crit(struct device *dev, struct device_attribute *devattr, const char *buf,
@@ -684,11 +685,11 @@ static ssize_t set_temp_crit(struct device *dev, struct device_attribute *devatt
         struct pc87360_data *data = i2c_get_clientdata(client);
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp_crit[attr->index] = TEMP_TO_REG(val);
         pc87360_write_value(data, LD_TEMP, attr->index, PC87365_REG_TEMP_CRIT,
                             data->temp_crit[attr->index]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -845,7 +846,7 @@ static int pc87360_detect(struct i2c_adapter *adapter)
         dev = &client->dev;
         i2c_set_clientdata(client, data);
         client->addr = address;
-        init_MUTEX(&data->lock);
+        mutex_init(&data->lock);
         client->adapter = adapter;
         client->driver = &pc87360_driver;
         client->flags = 0;
@@ -878,7 +879,7 @@ static int pc87360_detect(struct i2c_adapter *adapter)
 
         strlcpy(client->name, name, sizeof(client->name));
         data->valid = 0;
-        init_MUTEX(&data->update_lock);
+        mutex_init(&data->update_lock);
 
         for (i = 0; i < 3; i++) {
                 if (((data->address[i] = extra_isa[i]))
@@ -1027,11 +1028,11 @@ static int pc87360_read_value(struct pc87360_data *data, u8 ldi, u8 bank,
 {
         int res;
 
-        down(&(data->lock));
+        mutex_lock(&(data->lock));
         if (bank != NO_BANK)
                 outb_p(bank, data->address[ldi] + PC87365_REG_BANK);
         res = inb_p(data->address[ldi] + reg);
-        up(&(data->lock));
+        mutex_unlock(&(data->lock));
 
         return res;
 }
@@ -1039,11 +1040,11 @@ static int pc87360_read_value(struct pc87360_data *data, u8 ldi, u8 bank,
 static void pc87360_write_value(struct pc87360_data *data, u8 ldi, u8 bank,
                                 u8 reg, u8 value)
 {
-        down(&(data->lock));
+        mutex_lock(&(data->lock));
         if (bank != NO_BANK)
                 outb_p(bank, data->address[ldi] + PC87365_REG_BANK);
         outb_p(value, data->address[ldi] + reg);
-        up(&(data->lock));
+        mutex_unlock(&(data->lock));
 }
 
 static void pc87360_init_client(struct i2c_client *client, int use_thermistors)
@@ -1215,7 +1216,7 @@ static struct pc87360_data *pc87360_update_device(struct device *dev)
         struct pc87360_data *data = i2c_get_clientdata(client);
         u8 i;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         if (time_after(jiffies, data->last_updated + HZ * 2) || !data->valid) {
                 dev_dbg(&client->dev, "Data update\n");
@@ -1315,7 +1316,7 @@ static struct pc87360_data *pc87360_update_device(struct device *dev)
                 data->valid = 1;
         }
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return data;
 }
diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c
index 8be5189d9bd9..4db0dd871eee 100644
--- a/drivers/hwmon/sis5595.c
+++ b/drivers/hwmon/sis5595.c
@@ -60,6 +60,7 @@
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/jiffies.h>
+#include <linux/mutex.h>
 #include <asm/io.h>
 
 
@@ -167,9 +168,9 @@ static inline u8 DIV_TO_REG(int val)
 struct sis5595_data {
         struct i2c_client client;
         struct class_device *class_dev;
-        struct semaphore lock;
+        struct mutex lock;
 
-        struct semaphore update_lock;
+        struct mutex update_lock;
         char valid;             /* !=0 if following fields are valid */
         unsigned long last_updated;     /* In jiffies */
         char maxins;            /* == 3 if temp enabled, otherwise == 4 */
@@ -231,10 +232,10 @@ static ssize_t set_in_min(struct device *dev, const char *buf,
         struct sis5595_data *data = i2c_get_clientdata(client);
         unsigned long val = simple_strtoul(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->in_min[nr] = IN_TO_REG(val);
         sis5595_write_value(client, SIS5595_REG_IN_MIN(nr), data->in_min[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -245,10 +246,10 @@ static ssize_t set_in_max(struct device *dev, const char *buf,
         struct sis5595_data *data = i2c_get_clientdata(client);
         unsigned long val = simple_strtoul(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->in_max[nr] = IN_TO_REG(val);
         sis5595_write_value(client, SIS5595_REG_IN_MAX(nr), data->in_max[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -310,10 +311,10 @@ static ssize_t set_temp_over(struct device *dev, struct device_attribute *attr,
         struct sis5595_data *data = i2c_get_clientdata(client);
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp_over = TEMP_TO_REG(val);
         sis5595_write_value(client, SIS5595_REG_TEMP_OVER, data->temp_over);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -329,10 +330,10 @@ static ssize_t set_temp_hyst(struct device *dev, struct device_attribute *attr,
         struct sis5595_data *data = i2c_get_clientdata(client);
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp_hyst = TEMP_TO_REG(val);
         sis5595_write_value(client, SIS5595_REG_TEMP_HYST, data->temp_hyst);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -364,10 +365,10 @@ static ssize_t set_fan_min(struct device *dev, const char *buf,
         struct sis5595_data *data = i2c_get_clientdata(client);
         unsigned long val = simple_strtoul(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->fan_min[nr] = FAN_TO_REG(val, DIV_FROM_REG(data->fan_div[nr]));
         sis5595_write_value(client, SIS5595_REG_FAN_MIN(nr), data->fan_min[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -390,7 +391,7 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
         unsigned long val = simple_strtoul(buf, NULL, 10);
         int reg;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         min = FAN_FROM_REG(data->fan_min[nr],
                         DIV_FROM_REG(data->fan_div[nr]));
         reg = sis5595_read_value(client, SIS5595_REG_FANDIV);
@@ -403,7 +404,7 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
         default:
                 dev_err(&client->dev, "fan_div value %ld not "
                         "supported. Choose one of 1, 2, 4 or 8!\n", val);
-                up(&data->update_lock);
+                mutex_unlock(&data->update_lock);
                 return -EINVAL;
         }
         
@@ -419,7 +420,7 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
         data->fan_min[nr] =
                 FAN_TO_REG(min, DIV_FROM_REG(data->fan_div[nr]));
         sis5595_write_value(client, SIS5595_REG_FAN_MIN(nr), data->fan_min[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -527,7 +528,7 @@ static int sis5595_detect(struct i2c_adapter *adapter)
 
         new_client = &data->client;
         new_client->addr = address;
-        init_MUTEX(&data->lock);
+        mutex_init(&data->lock);
         i2c_set_clientdata(new_client, data);
         new_client->adapter = adapter;
         new_client->driver = &sis5595_driver;
@@ -548,7 +549,7 @@ static int sis5595_detect(struct i2c_adapter *adapter)
         strlcpy(new_client->name, "sis5595", I2C_NAME_SIZE);
 
         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)))
@@ -635,20 +636,20 @@ static int sis5595_read_value(struct i2c_client *client, u8 reg)
         int res;
 
         struct sis5595_data *data = i2c_get_clientdata(client);
-        down(&data->lock);
+        mutex_lock(&data->lock);
         outb_p(reg, client->addr + SIS5595_ADDR_REG_OFFSET);
         res = inb_p(client->addr + SIS5595_DATA_REG_OFFSET);
-        up(&data->lock);
+        mutex_unlock(&data->lock);
         return res;
 }
 
 static int sis5595_write_value(struct i2c_client *client, u8 reg, u8 value)
 {
         struct sis5595_data *data = i2c_get_clientdata(client);
-        down(&data->lock);
+        mutex_lock(&data->lock);
         outb_p(reg, client->addr + SIS5595_ADDR_REG_OFFSET);
         outb_p(value, client->addr + SIS5595_DATA_REG_OFFSET);
-        up(&data->lock);
+        mutex_unlock(&data->lock);
         return 0;
 }
 
@@ -667,7 +668,7 @@ static struct sis5595_data *sis5595_update_device(struct device *dev)
         struct sis5595_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) {
@@ -707,7 +708,7 @@ static struct sis5595_data *sis5595_update_device(struct device *dev)
                 data->valid = 1;
         }
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return data;
 }
diff --git a/drivers/hwmon/smsc47b397.c b/drivers/hwmon/smsc47b397.c
index 8663bbbe97f5..b6086186d225 100644
--- a/drivers/hwmon/smsc47b397.c
+++ b/drivers/hwmon/smsc47b397.c
@@ -35,6 +35,7 @@
 #include <linux/hwmon.h>
 #include <linux/err.h>
 #include <linux/init.h>
+#include <linux/mutex.h>
 #include <asm/io.h>
 
 /* Address is autodetected, there is no default value */
@@ -92,9 +93,9 @@ static u8 smsc47b397_reg_temp[] = {0x25, 0x26, 0x27, 0x80};
 struct smsc47b397_data {
         struct i2c_client client;
         struct class_device *class_dev;
-        struct semaphore lock;
+        struct mutex lock;
 
-        struct semaphore update_lock;
+        struct mutex update_lock;
         unsigned long last_updated; /* in jiffies */
         int valid;
 
@@ -108,10 +109,10 @@ static int smsc47b397_read_value(struct i2c_client *client, u8 reg)
         struct smsc47b397_data *data = i2c_get_clientdata(client);
         int res;
 
-        down(&data->lock);
+        mutex_lock(&data->lock);
         outb(reg, client->addr);
         res = inb_p(client->addr + 1);
-        up(&data->lock);
+        mutex_unlock(&data->lock);
         return res;
 }
 
@@ -121,7 +122,7 @@ static struct smsc47b397_data *smsc47b397_update_device(struct device *dev)
         struct smsc47b397_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) || !data->valid) {
                 dev_dbg(&client->dev, "starting device update...\n");
@@ -144,7 +145,7 @@ static struct smsc47b397_data *smsc47b397_update_device(struct device *dev)
                 dev_dbg(&client->dev, "... device update complete\n");
         }
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return data;
 }
@@ -254,14 +255,14 @@ static int smsc47b397_detect(struct i2c_adapter *adapter)
         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 = &smsc47b397_driver;
         new_client->flags = 0;
 
         strlcpy(new_client->name, "smsc47b397", I2C_NAME_SIZE);
 
-        init_MUTEX(&data->update_lock);
+        mutex_init(&data->update_lock);
 
         if ((err = i2c_attach_client(new_client)))
                 goto error_free;
diff --git a/drivers/hwmon/smsc47m1.c b/drivers/hwmon/smsc47m1.c
index d1e3ec0fe4df..7732aec54594 100644
--- a/drivers/hwmon/smsc47m1.c
+++ b/drivers/hwmon/smsc47m1.c
@@ -34,6 +34,7 @@
 #include <linux/hwmon.h>
 #include <linux/err.h>
 #include <linux/init.h>
+#include <linux/mutex.h>
 #include <asm/io.h>
 
 /* Address is autodetected, there is no default value */
@@ -102,9 +103,9 @@ superio_exit(void)
 struct smsc47m1_data {
         struct i2c_client client;
         struct class_device *class_dev;
-        struct semaphore lock;
+        struct mutex lock;
 
-        struct semaphore update_lock;
+        struct mutex update_lock;
         unsigned long last_updated;     /* In jiffies */
 
         u8 fan[2];              /* Register value */
@@ -188,18 +189,18 @@ static ssize_t set_fan_min(struct device *dev, const char *buf,
         struct smsc47m1_data *data = i2c_get_clientdata(client);
         long rpmdiv, val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         rpmdiv = val * DIV_FROM_REG(data->fan_div[nr]);
 
         if (983040 > 192 * rpmdiv || 2 * rpmdiv > 983040) {
-                up(&data->update_lock);
+                mutex_unlock(&data->update_lock);
                 return -EINVAL;
         }
 
         data->fan_preload[nr] = 192 - ((983040 + rpmdiv / 2) / rpmdiv);
         smsc47m1_write_value(client, SMSC47M1_REG_FAN_PRELOAD(nr),
                              data->fan_preload[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return count;
 }
@@ -220,14 +221,14 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
         if (new_div == old_div) /* No change */
                 return count;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         switch (new_div) {
         case 1: data->fan_div[nr] = 0; break;
         case 2: data->fan_div[nr] = 1; break;
         case 4: data->fan_div[nr] = 2; break;
         case 8: data->fan_div[nr] = 3; break;
         default:
-                up(&data->update_lock);
+                mutex_unlock(&data->update_lock);
                 return -EINVAL;
         }
 
@@ -241,7 +242,7 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
         data->fan_preload[nr] = SENSORS_LIMIT(tmp, 0, 191);
         smsc47m1_write_value(client, SMSC47M1_REG_FAN_PRELOAD(nr),
                              data->fan_preload[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return count;
 }
@@ -257,12 +258,12 @@ static ssize_t set_pwm(struct device *dev, const char *buf,
         if (val < 0 || val > 255)
                 return -EINVAL;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->pwm[nr] &= 0x81; /* Preserve additional bits */
         data->pwm[nr] |= PWM_TO_REG(val);
         smsc47m1_write_value(client, SMSC47M1_REG_PWM(nr),
                              data->pwm[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return count;
 }
@@ -278,12 +279,12 @@ static ssize_t set_pwm_en(struct device *dev, const char *buf,
         if (val != 0 && val != 1)
                 return -EINVAL;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->pwm[nr] &= 0xFE; /* preserve the other bits */
         data->pwm[nr] |= !val;
         smsc47m1_write_value(client, SMSC47M1_REG_PWM(nr),
                              data->pwm[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return count;
 }
@@ -408,13 +409,13 @@ static int smsc47m1_detect(struct i2c_adapter *adapter)
         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 = &smsc47m1_driver;
         new_client->flags = 0;
 
         strlcpy(new_client->name, "smsc47m1", I2C_NAME_SIZE);
-        init_MUTEX(&data->update_lock);
+        mutex_init(&data->update_lock);
 
         /* If no function is properly configured, there's no point in
            actually registering the chip. */
@@ -512,17 +513,17 @@ static int smsc47m1_read_value(struct i2c_client *client, u8 reg)
 {
         int res;
 
-        down(&((struct smsc47m1_data *) i2c_get_clientdata(client))->lock);
+        mutex_lock(&((struct smsc47m1_data *) i2c_get_clientdata(client))->lock);
         res = inb_p(client->addr + reg);
-        up(&((struct smsc47m1_data *) i2c_get_clientdata(client))->lock);
+        mutex_unlock(&((struct smsc47m1_data *) i2c_get_clientdata(client))->lock);
         return res;
 }
 
 static void smsc47m1_write_value(struct i2c_client *client, u8 reg, u8 value)
 {
-        down(&((struct smsc47m1_data *) i2c_get_clientdata(client))->lock);
+        mutex_lock(&((struct smsc47m1_data *) i2c_get_clientdata(client))->lock);
         outb_p(value, client->addr + reg);
-        up(&((struct smsc47m1_data *) i2c_get_clientdata(client))->lock);
+        mutex_unlock(&((struct smsc47m1_data *) i2c_get_clientdata(client))->lock);
 }
 
 static struct smsc47m1_data *smsc47m1_update_device(struct device *dev,
@@ -531,7 +532,7 @@ static struct smsc47m1_data *smsc47m1_update_device(struct device *dev,
         struct i2c_client *client = to_i2c_client(dev);
         struct smsc47m1_data *data = i2c_get_clientdata(client);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         if (time_after(jiffies, data->last_updated + HZ + HZ / 2) || init) {
                 int i;
@@ -558,7 +559,7 @@ static struct smsc47m1_data *smsc47m1_update_device(struct device *dev,
                 data->last_updated = jiffies;
         }
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return data;
 }
 
diff --git a/drivers/hwmon/via686a.c b/drivers/hwmon/via686a.c
index cb01848729b5..166298f1f190 100644
--- a/drivers/hwmon/via686a.c
+++ b/drivers/hwmon/via686a.c
@@ -39,6 +39,7 @@
 #include <linux/hwmon.h>
 #include <linux/err.h>
 #include <linux/init.h>
+#include <linux/mutex.h>
 #include <asm/io.h>
 
 
@@ -296,7 +297,7 @@ static inline long TEMP_FROM_REG10(u16 val)
 struct via686a_data {
         struct i2c_client client;
         struct class_device *class_dev;
-        struct semaphore update_lock;
+        struct mutex update_lock;
         char valid;             /* !=0 if following fields are valid */
         unsigned long last_updated;     /* In jiffies */
 
@@ -355,11 +356,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);
 
-        down(&data->update_lock);
+        mutex_lock(&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]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 static ssize_t set_in_max(struct device *dev, const char *buf,
@@ -368,11 +369,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);
 
-        down(&data->update_lock);
+        mutex_lock(&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]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 #define show_in_offset(offset)                                  \
@@ -432,11 +433,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);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp_over[nr] = TEMP_TO_REG(val);
         via686a_write_value(client, VIA686A_REG_TEMP_OVER[nr],
                             data->temp_over[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 static ssize_t set_temp_hyst(struct device *dev, const char *buf,
@@ -445,11 +446,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);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp_hyst[nr] = TEMP_TO_REG(val);
         via686a_write_value(client, VIA686A_REG_TEMP_HYST[nr],
                             data->temp_hyst[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 #define show_temp_offset(offset)                                        \
@@ -508,10 +509,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);
 
-        down(&data->update_lock);
+        mutex_lock(&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]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 static ssize_t set_fan_div(struct device *dev, const char *buf,
@@ -521,12 +522,12 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
         int val = simple_strtol(buf, NULL, 10);
         int old;
 
-        down(&data->update_lock);
+        mutex_lock(&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);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -639,7 +640,7 @@ static int via686a_detect(struct i2c_adapter *adapter)
         strlcpy(new_client->name, client_name, I2C_NAME_SIZE);
 
         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)))
                 goto exit_free;
@@ -733,7 +734,7 @@ static struct via686a_data *via686a_update_device(struct device *dev)
         struct via686a_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) {
@@ -788,7 +789,7 @@ static struct via686a_data *via686a_update_device(struct device *dev)
                 data->valid = 1;
         }
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return data;
 }
diff --git a/drivers/hwmon/vt8231.c b/drivers/hwmon/vt8231.c
index 271e9cb9532c..686f3deb3093 100644
--- a/drivers/hwmon/vt8231.c
+++ b/drivers/hwmon/vt8231.c
@@ -35,6 +35,7 @@
 #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;
@@ -148,7 +149,7 @@ static inline u8 FAN_TO_REG(long rpm, int div)
 
 struct vt8231_data {
         struct i2c_client client;
-        struct semaphore update_lock;
+        struct mutex update_lock;
         struct class_device *class_dev;
         char valid;             /* !=0 if following fields are valid */
         unsigned long last_updated;     /* In jiffies */
@@ -223,10 +224,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);
 
-        down(&data->update_lock);
+        mutex_lock(&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]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -239,10 +240,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);
 
-        down(&data->update_lock);
+        mutex_lock(&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]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -281,11 +282,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);
 
-        down(&data->update_lock);
+        mutex_lock(&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]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -296,11 +297,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);
 
-        down(&data->update_lock);
+        mutex_lock(&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]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -351,10 +352,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);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp_max[0] = SENSORS_LIMIT((val + 500) / 1000, 0, 255);
         vt8231_write_value(client, regtempmax[0], data->temp_max[0]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 static ssize_t set_temp0_min(struct device *dev, struct device_attribute *attr,
@@ -364,10 +365,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);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp_min[0] = SENSORS_LIMIT((val + 500) / 1000, 0, 255);
         vt8231_write_value(client, regtempmin[0], data->temp_min[0]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -407,10 +408,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);
 
-        down(&data->update_lock);
+        mutex_lock(&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]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,
@@ -422,10 +423,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);
 
-        down(&data->update_lock);
+        mutex_lock(&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]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -520,10 +521,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);
 
-        down(&data->update_lock);
+        mutex_lock(&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]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -539,7 +540,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]));
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         switch (val) {
         case 1: data->fan_div[nr] = 0; break;
         case 2: data->fan_div[nr] = 1; break;
@@ -548,7 +549,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);
-                up(&data->update_lock);
+                mutex_unlock(&data->update_lock);
                 return -EINVAL;
         }
 
@@ -558,7 +559,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);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -660,7 +661,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);
 
-        init_MUTEX(&data->update_lock);
+        mutex_init(&data->update_lock);
 
         /* Tell the I2C layer a new client has arrived */
         if ((err = i2c_attach_client(client)))
@@ -745,7 +746,7 @@ static struct vt8231_data *vt8231_update_device(struct device *dev)
         int i;
         u16 low;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
             || !data->valid) {
@@ -804,7 +805,7 @@ static struct vt8231_data *vt8231_update_device(struct device *dev)
                 data->valid = 1;
         }
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return data;
 }
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
index 12d79f5e4900..1affaf15beda 100644
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
@@ -43,6 +43,7 @@
 #include <linux/i2c-isa.h>
 #include <linux/hwmon.h>
 #include <linux/err.h>
+#include <linux/mutex.h>
 #include <asm/io.h>
 #include "lm75.h"
 
@@ -177,9 +178,9 @@ temp1_to_reg(int temp)
 struct w83627ehf_data {
         struct i2c_client client;
         struct class_device *class_dev;
-        struct semaphore lock;
+        struct mutex lock;
 
-        struct semaphore update_lock;
+        struct mutex update_lock;
         char valid;             /* !=0 if following fields are valid */
         unsigned long last_updated;     /* In jiffies */
 
@@ -230,7 +231,7 @@ static u16 w83627ehf_read_value(struct i2c_client *client, u16 reg)
         struct w83627ehf_data *data = i2c_get_clientdata(client);
         int res, word_sized = is_word_sized(reg);
 
-        down(&data->lock);
+        mutex_lock(&data->lock);
 
         w83627ehf_set_bank(client, reg);
         outb_p(reg & 0xff, client->addr + ADDR_REG_OFFSET);
@@ -242,7 +243,7 @@ static u16 w83627ehf_read_value(struct i2c_client *client, u16 reg)
         }
         w83627ehf_reset_bank(client, reg);
 
-        up(&data->lock);
+        mutex_unlock(&data->lock);
 
         return res;
 }
@@ -252,7 +253,7 @@ static int w83627ehf_write_value(struct i2c_client *client, u16 reg, u16 value)
         struct w83627ehf_data *data = i2c_get_clientdata(client);
         int word_sized = is_word_sized(reg);
 
-        down(&data->lock);
+        mutex_lock(&data->lock);
 
         w83627ehf_set_bank(client, reg);
         outb_p(reg & 0xff, client->addr + ADDR_REG_OFFSET);
@@ -264,7 +265,7 @@ static int w83627ehf_write_value(struct i2c_client *client, u16 reg, u16 value)
         outb_p(value & 0xff, client->addr + DATA_REG_OFFSET);
         w83627ehf_reset_bank(client, reg);
 
-        up(&data->lock);
+        mutex_unlock(&data->lock);
         return 0;
 }
 
@@ -322,7 +323,7 @@ static struct w83627ehf_data *w83627ehf_update_device(struct device *dev)
         struct w83627ehf_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)
          || !data->valid) {
@@ -397,7 +398,7 @@ static struct w83627ehf_data *w83627ehf_update_device(struct device *dev)
                 data->valid = 1;
         }
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return data;
 }
 
@@ -434,7 +435,7 @@ store_fan_min(struct device *dev, const char *buf, size_t count, int nr)
         unsigned int reg;
         u8 new_div;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         if (!val) {
                 /* No min limit, alarm disabled */
                 data->fan_min[nr] = 255;
@@ -482,7 +483,7 @@ store_fan_min(struct device *dev, const char *buf, size_t count, int nr)
         }
         w83627ehf_write_value(client, W83627EHF_REG_FAN_MIN[nr],
                               data->fan_min[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return count;
 }
@@ -561,11 +562,11 @@ store_temp1_##reg(struct device *dev, struct device_attribute *attr, \
         struct w83627ehf_data *data = i2c_get_clientdata(client); \
         u32 val = simple_strtoul(buf, NULL, 10); \
  \
-        down(&data->update_lock); \
+        mutex_lock(&data->update_lock); \
         data->temp1_##reg = temp1_to_reg(val); \
         w83627ehf_write_value(client, W83627EHF_REG_TEMP1_##REG, \
                               data->temp1_##reg); \
-        up(&data->update_lock); \
+        mutex_unlock(&data->update_lock); \
         return count; \
 }
 store_temp1_reg(OVER, max);
@@ -597,11 +598,11 @@ store_##reg (struct device *dev, const char *buf, size_t count, int nr) \
         struct w83627ehf_data *data = i2c_get_clientdata(client); \
         u32 val = simple_strtoul(buf, NULL, 10); \
  \
-        down(&data->update_lock); \
+        mutex_lock(&data->update_lock); \
         data->reg[nr] = LM75_TEMP_TO_REG(val); \
         w83627ehf_write_value(client, W83627EHF_REG_TEMP_##REG[nr], \
                               data->reg[nr]); \
-        up(&data->update_lock); \
+        mutex_unlock(&data->update_lock); \
         return count; \
 }
 store_temp_reg(OVER, temp_max);
@@ -689,14 +690,14 @@ static int w83627ehf_detect(struct i2c_adapter *adapter)
         client = &data->client;
         i2c_set_clientdata(client, data);
         client->addr = address;
-        init_MUTEX(&data->lock);
+        mutex_init(&data->lock);
         client->adapter = adapter;
         client->driver = &w83627ehf_driver;
         client->flags = 0;
 
         strlcpy(client->name, "w83627ehf", I2C_NAME_SIZE);
         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(client)))
diff --git a/drivers/hwmon/w83627hf.c b/drivers/hwmon/w83627hf.c
index 7ea441d4da63..3d4888c178c9 100644
--- a/drivers/hwmon/w83627hf.c
+++ b/drivers/hwmon/w83627hf.c
@@ -46,6 +46,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"
 
@@ -285,10 +286,10 @@ static inline u8 DIV_TO_REG(long val)
 struct w83627hf_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 */
 
@@ -360,12 +361,12 @@ store_in_##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->in_##reg[nr] = IN_TO_REG(val); \
         w83627hf_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)
@@ -451,7 +452,7 @@ static ssize_t store_regs_in_min0(struct device *dev, struct device_attribute *a
 
         val = simple_strtoul(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         
         if ((data->vrm_ovt & 0x01) &&
                 (w83627thf == data->type || w83637hf == data->type))
@@ -465,7 +466,7 @@ static ssize_t store_regs_in_min0(struct device *dev, struct device_attribute *a
                 data->in_min[0] = IN_TO_REG(val);
 
         w83627hf_write_value(client, W83781D_REG_IN_MIN(0), data->in_min[0]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -478,7 +479,7 @@ static ssize_t store_regs_in_max0(struct device *dev, struct device_attribute *a
 
         val = simple_strtoul(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         if ((data->vrm_ovt & 0x01) &&
                 (w83627thf == data->type || w83637hf == data->type))
@@ -492,7 +493,7 @@ static ssize_t store_regs_in_max0(struct device *dev, struct device_attribute *a
                 data->in_max[0] = IN_TO_REG(val);
 
         w83627hf_write_value(client, W83781D_REG_IN_MAX(0), data->in_max[0]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -529,13 +530,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]));
         w83627hf_write_value(client, W83781D_REG_FAN_MIN(nr),
                             data->fan_min[nr - 1]);
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -597,7 +598,7 @@ store_temp_##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); \
          \
         if (nr >= 2) {  /* TEMP2 and TEMP3 */ \
                 data->temp_##reg##_add[nr-2] = LM75_TEMP_TO_REG(val); \
@@ -609,7 +610,7 @@ store_temp_##reg (struct device *dev, const char *buf, size_t count, int nr) \
                         data->temp_##reg); \
         } \
          \
-        up(&data->update_lock); \
+        mutex_unlock(&data->update_lock); \
         return count; \
 }
 store_temp_reg(OVER, max);
@@ -718,7 +719,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);
@@ -736,7 +737,7 @@ store_beep_reg(struct device *dev, const char *buf, size_t count,
         w83627hf_write_value(client, W83781D_REG_BEEP_INTS2,
                             val2 | data->beep_enable << 7);
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -783,7 +784,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],
@@ -805,7 +806,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]));
         w83627hf_write_value(client, W83781D_REG_FAN_MIN(nr+1), data->fan_min[nr]);
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -848,7 +849,7 @@ 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);
 
         if (data->type == w83627thf) {
                 /* bits 0-3 are reserved  in 627THF */
@@ -865,7 +866,7 @@ store_pwm_reg(struct device *dev, const char *buf, size_t count, int nr)
                                      data->pwm[nr - 1]);
         }
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
         return count;
 }
 
@@ -907,7 +908,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 */
@@ -941,7 +942,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;
 }
 
@@ -1057,7 +1058,7 @@ static int w83627hf_detect(struct i2c_adapter *adapter)
         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 = &w83627hf_driver;
         new_client->flags = 0;
@@ -1077,7 +1078,7 @@ static int w83627hf_detect(struct i2c_adapter *adapter)
         strlcpy(new_client->name, client_name, I2C_NAME_SIZE);
         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)))
@@ -1187,7 +1188,7 @@ static int w83627hf_read_value(struct i2c_client *client, u16 reg)
         struct w83627hf_data *data = i2c_get_clientdata(client);
         int res, word_sized;
 
-        down(&data->lock);
+        mutex_lock(&data->lock);
         word_sized = (((reg & 0xff00) == 0x100)
                    || ((reg & 0xff00) == 0x200))
                   && (((reg & 0x00ff) == 0x50)
@@ -1213,7 +1214,7 @@ static int w83627hf_read_value(struct i2c_client *client, u16 reg)
                        client->addr + W83781D_ADDR_REG_OFFSET);
                 outb_p(0, client->addr + W83781D_DATA_REG_OFFSET);
         }
-        up(&data->lock);
+        mutex_unlock(&data->lock);
         return res;
 }
 
@@ -1252,7 +1253,7 @@ static int w83627hf_write_value(struct i2c_client *client, u16 reg, u16 value)
         struct w83627hf_data *data = i2c_get_clientdata(client);
         int word_sized;
 
-        down(&data->lock);
+        mutex_lock(&data->lock);
         word_sized = (((reg & 0xff00) == 0x100)
                    || ((reg & 0xff00) == 0x200))
                   && (((reg & 0x00ff) == 0x53)
@@ -1277,7 +1278,7 @@ static int w83627hf_write_value(struct i2c_client *client, u16 reg, u16 value)
                        client->addr + W83781D_ADDR_REG_OFFSET);
                 outb_p(0, client->addr + W83781D_DATA_REG_OFFSET);
         }
-        up(&data->lock);
+        mutex_unlock(&data->lock);
         return 0;
 }
 
@@ -1387,7 +1388,7 @@ static struct w83627hf_data *w83627hf_update_device(struct device *dev)
         struct w83627hf_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) {
@@ -1470,7 +1471,7 @@ static struct w83627hf_data *w83627hf_update_device(struct device *dev)
                 data->valid = 1;
         }
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return data;
 }
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;
 }
diff --git a/drivers/hwmon/w83792d.c b/drivers/hwmon/w83792d.c
index 2e86e188b27a..6865c64d8a51 100644
--- a/drivers/hwmon/w83792d.c
+++ b/drivers/hwmon/w83792d.c
@@ -43,6 +43,7 @@
 #include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
 #include <linux/err.h>
+#include <linux/mutex.h>
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f, I2C_CLIENT_END };
@@ -271,7 +272,7 @@ struct w83792d_data {
         struct class_device *class_dev;
         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 */
 
@@ -1222,7 +1223,7 @@ w83792d_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(client)))
@@ -1373,7 +1374,7 @@ static struct w83792d_data *w83792d_update_device(struct device *dev)
         int i, j;
         u8 reg_array_tmp[4], pwm_array_tmp[7], reg_tmp;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         if (time_after
             (jiffies - data->last_updated, (unsigned long) (HZ * 3))
@@ -1484,7 +1485,7 @@ static struct w83792d_data *w83792d_update_device(struct device *dev)
                 data->valid = 1;
         }
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
 #ifdef DEBUG
         w83792d_print_debug(data, dev);
diff --git a/drivers/hwmon/w83l785ts.c b/drivers/hwmon/w83l785ts.c
index f66c0cfdeda7..3f2bac125fb1 100644
--- a/drivers/hwmon/w83l785ts.c
+++ b/drivers/hwmon/w83l785ts.c
@@ -39,6 +39,7 @@
 #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
@@ -107,7 +108,7 @@ static struct i2c_driver w83l785ts_driver = {
 struct w83l785ts_data {
         struct i2c_client client;
         struct class_device *class_dev;
-        struct semaphore update_lock;
+        struct mutex update_lock;
         char valid; /* zero until following fields are valid */
         unsigned long last_updated; /* in jiffies */
 
@@ -221,7 +222,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;
-        init_MUTEX(&data->update_lock);
+        mutex_init(&data->update_lock);
 
         /* Default values in case the first read fails (unlikely). */
         data->temp[1] = data->temp[0] = 0;
@@ -299,7 +300,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);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         if (!data->valid || time_after(jiffies, data->last_updated + HZ * 2)) {
                 dev_dbg(&client->dev, "Updating w83l785ts data.\n");
@@ -312,7 +313,7 @@ static struct w83l785ts_data *w83l785ts_update_device(struct device *dev)
                 data->valid = 1;
         }
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return data;
 }