linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/drivers/hwmon/lm85.c b/drivers/hwmon/lm85.c
index 342e966..7389a01 100644 (file)
--- a/drivers/hwmon/lm85.c
+++ b/drivers/hwmon/lm85.c
@@ -31,7 +31,6 @@
 #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 };
@@ -332,10 +331,10 @@ struct lm85_autofan {
 struct lm85_data {
        struct i2c_client client;
        struct class_device *class_dev;
-       struct mutex lock;
+       struct semaphore lock;
        enum chips type;
 
-       struct mutex update_lock;
+       struct semaphore update_lock;
        int valid;              /* !=0 if following fields are valid */
        unsigned long last_reading;     /* In jiffies */
        unsigned long last_config;      /* In jiffies */
@@ -374,8 +373,8 @@ static int lm85_detect(struct i2c_adapter *adapter, int address,
                        int kind);
 static int lm85_detach_client(struct i2c_client *client);
 
-static int lm85_read_value(struct i2c_client *client, u8 reg);
-static int lm85_write_value(struct i2c_client *client, u8 reg, int value);
+static int lm85_read_value(struct i2c_client *client, u8 register);
+static int lm85_write_value(struct i2c_client *client, u8 register, int value);
 static struct lm85_data *lm85_update_device(struct device *dev);
 static void lm85_init_client(struct i2c_client *client);
 
@@ -408,10 +407,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);
 
-       mutex_lock(&data->update_lock);
+       down(&data->update_lock);
        data->fan_min[nr] = FAN_TO_REG(val);
        lm85_write_value(client, LM85_REG_FAN_MIN(nr), data->fan_min[nr]);
-       mutex_unlock(&data->update_lock);
+       up(&data->update_lock);
        return count;
 }
 
@@ -500,10 +499,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);
 
-       mutex_lock(&data->update_lock);
+       down(&data->update_lock);
        data->pwm[nr] = PWM_TO_REG(val);
        lm85_write_value(client, LM85_REG_PWM(nr), data->pwm[nr]);
-       mutex_unlock(&data->update_lock);
+       up(&data->update_lock);
        return count;
 }
 static ssize_t show_pwm_enable(struct device *dev, char *buf, int nr)
@@ -560,10 +559,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);
 
-       mutex_lock(&data->update_lock);
+       down(&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]);
-       mutex_unlock(&data->update_lock);
+       up(&data->update_lock);
        return count;
 }
 static ssize_t show_in_max(struct device *dev, char *buf, int nr)
@@ -578,10 +577,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);
 
-       mutex_lock(&data->update_lock);
+       down(&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]);
-       mutex_unlock(&data->update_lock);
+       up(&data->update_lock);
        return count;
 }
 #define show_in_reg(offset)                                            \
@@ -641,10 +640,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);
 
-       mutex_lock(&data->update_lock);
+       down(&data->update_lock);
        data->temp_min[nr] = TEMP_TO_REG(val);
        lm85_write_value(client, LM85_REG_TEMP_MIN(nr), data->temp_min[nr]);
-       mutex_unlock(&data->update_lock);
+       up(&data->update_lock);
        return count;
 }
 static ssize_t show_temp_max(struct device *dev, char *buf, int nr)
@@ -659,10 +658,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);        
 
-       mutex_lock(&data->update_lock);
+       down(&data->update_lock);
        data->temp_max[nr] = TEMP_TO_REG(val);
        lm85_write_value(client, LM85_REG_TEMP_MAX(nr), data->temp_max[nr]);
-       mutex_unlock(&data->update_lock);
+       up(&data->update_lock);
        return count;
 }
 #define show_temp_reg(offset)                                          \
@@ -714,12 +713,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);   
 
-       mutex_lock(&data->update_lock);
+       down(&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);
-       mutex_unlock(&data->update_lock);
+       up(&data->update_lock);
        return count;
 }
 static ssize_t show_pwm_auto_pwm_min(struct device *dev, char *buf, int nr)
@@ -734,11 +733,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);
 
-       mutex_lock(&data->update_lock);
+       down(&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);
-       mutex_unlock(&data->update_lock);
+       up(&data->update_lock);
        return count;
 }
 static ssize_t show_pwm_auto_pwm_minctl(struct device *dev, char *buf, int nr)
@@ -753,7 +752,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);
 
-       mutex_lock(&data->update_lock);
+       down(&data->update_lock);
        data->autofan[nr].min_off = val;
        lm85_write_value(client, LM85_REG_AFAN_SPIKE1, data->smooth[0]
                | data->syncpwm3
@@ -761,7 +760,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)
        );
-       mutex_unlock(&data->update_lock);
+       up(&data->update_lock);
        return count;
 }
 static ssize_t show_pwm_auto_pwm_freq(struct device *dev, char *buf, int nr)
@@ -776,13 +775,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);
 
-       mutex_lock(&data->update_lock);
+       down(&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
        ); 
-       mutex_unlock(&data->update_lock);
+       up(&data->update_lock);
        return count;
 }
 #define pwm_auto(offset)                                               \
@@ -858,7 +857,7 @@ static ssize_t set_temp_auto_temp_off(struct device *dev, const char *buf,
        int min;
        long val = simple_strtol(buf, NULL, 10);
 
-       mutex_lock(&data->update_lock);
+       down(&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);
@@ -872,7 +871,7 @@ static ssize_t set_temp_auto_temp_off(struct device *dev, const char *buf,
                        (data->zone[2].hyst << 4)
                );
        }
-       mutex_unlock(&data->update_lock);
+       up(&data->update_lock);
        return count;
 }
 static ssize_t show_temp_auto_temp_min(struct device *dev, char *buf, int nr)
@@ -887,7 +886,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);
 
-       mutex_lock(&data->update_lock);
+       down(&data->update_lock);
        data->zone[nr].limit = TEMP_TO_REG(val);
        lm85_write_value(client, LM85_REG_AFAN_LIMIT(nr),
                data->zone[nr].limit);
@@ -914,7 +913,7 @@ static ssize_t set_temp_auto_temp_min(struct device *dev, const char *buf,
                        (data->zone[2].hyst << 4)
                );
        }
-       mutex_unlock(&data->update_lock);
+       up(&data->update_lock);
        return count;
 }
 static ssize_t show_temp_auto_temp_max(struct device *dev, char *buf, int nr)
@@ -931,7 +930,7 @@ static ssize_t set_temp_auto_temp_max(struct device *dev, const char *buf,
        int min;
        long val = simple_strtol(buf, NULL, 10);
 
-       mutex_lock(&data->update_lock);
+       down(&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(
@@ -939,7 +938,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));
-       mutex_unlock(&data->update_lock);
+       up(&data->update_lock);
        return count;
 }
 static ssize_t show_temp_auto_temp_crit(struct device *dev, char *buf, int nr)
@@ -954,11 +953,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);
 
-       mutex_lock(&data->update_lock);
+       down(&data->update_lock);
        data->zone[nr].critical = TEMP_TO_REG(val);
        lm85_write_value(client, LM85_REG_AFAN_CRITICAL(nr),
                data->zone[nr].critical);
-       mutex_unlock(&data->update_lock);
+       up(&data->update_lock);
        return count;
 }
 #define temp_auto(offset)                                              \
@@ -1150,7 +1149,7 @@ static int lm85_detect(struct i2c_adapter *adapter, int address,
        /* Fill in the remaining client fields */
        data->type = kind;
        data->valid = 0;
-       mutex_init(&data->update_lock);
+       init_MUTEX(&data->update_lock);
 
        /* Tell the I2C layer a new client has arrived */
        if ((err = i2c_attach_client(new_client)))
@@ -1369,7 +1368,7 @@ static struct lm85_data *lm85_update_device(struct device *dev)
        struct lm85_data *data = i2c_get_clientdata(client);
        int i;
 
-       mutex_lock(&data->update_lock);
+       down(&data->update_lock);
 
        if ( !data->valid ||
             time_after(jiffies, data->last_reading + LM85_DATA_INTERVAL) ) {
@@ -1572,7 +1571,7 @@ static struct lm85_data *lm85_update_device(struct device *dev)
 
        data->valid = 1;
 
-       mutex_unlock(&data->update_lock);
+       up(&data->update_lock);
 
        return data;
 }