[PATCH] i2c-parport: Make type parameter mandatory

[linux-2.6] / drivers / hwmon / lm87.c

diff --git a/drivers/hwmon/lm87.c b/drivers/hwmon/lm87.c
index f0ffe58e3670eac30a61050fbccd0fd94c397c23..e229daf666dedf4584f6617f3e5364c301cb5d34 100644 (file)
--- a/drivers/hwmon/lm87.c
+++ b/drivers/hwmon/lm87.c
@@ -57,10 +57,10 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-#include <linux/i2c-vid.h>
 #include <linux/hwmon.h>
+#include <linux/hwmon-vid.h>
 #include <linux/err.h>
+#include <linux/mutex.h>
 
 /*
  * Addresses to scan
@@ -73,7 +73,7 @@ static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
  * Insmod parameters
  */
 
-SENSORS_INSMOD_1(lm87);
+I2C_CLIENT_INSMOD_1(lm87);
 
 /*
  * The LM87 registers
@@ -162,10 +162,10 @@ static struct lm87_data *lm87_update_device(struct device *dev);
  */
 
 static struct i2c_driver lm87_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "lm87",
+       .driver = {
+               .name   = "lm87",
+       },
        .id             = I2C_DRIVERID_LM87,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = lm87_attach_adapter,
        .detach_client  = lm87_detach_client,
 };
@@ -177,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 */
 
@@ -254,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)
@@ -267,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) \
@@ -328,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)
@@ -340,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) \
@@ -412,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
@@ -432,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]));
 
@@ -442,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;
        }
 
@@ -460,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;
 }
@@ -523,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);
@@ -539,7 +539,7 @@ static int lm87_attach_adapter(struct i2c_adapter *adapter)
 {
        if (!(adapter->class & I2C_CLASS_HWMON))
                return 0;
-       return i2c_detect(adapter, &addr_data, lm87_detect);
+       return i2c_probe(adapter, &addr_data, lm87_detect);
 }
 
 /*
@@ -555,11 +555,10 @@ static int lm87_detect(struct i2c_adapter *adapter, int address, int kind)
        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                goto exit;
 
-       if (!(data = kmalloc(sizeof(struct lm87_data), GFP_KERNEL))) {
+       if (!(data = kzalloc(sizeof(struct lm87_data), GFP_KERNEL))) {
                err = -ENOMEM;
                goto exit;
        }
-       memset(data, 0, sizeof(struct lm87_data));
 
        /* The common I2C client data is placed right before the
           LM87-specific data. */
@@ -591,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)))
@@ -695,7 +694,7 @@ static void lm87_init_client(struct i2c_client *client)
        u8 config;
 
        data->channel = lm87_read_value(client, LM87_REG_CHANNEL_MODE);
-       data->vrm = i2c_which_vrm();
+       data->vrm = vid_which_vrm();
 
        config = lm87_read_value(client, LM87_REG_CONFIG);
        if (!(config & 0x01)) {
@@ -746,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;
@@ -815,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;
 }