Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block

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

diff --git a/drivers/hwmon/adm1021.c b/drivers/hwmon/adm1021.c
index da3e2c9f705f46b504abb33b986a396886a4023c..2b6e74dd4a82079c6eb18b44719846c33ae961ed 100644 (file)
--- a/drivers/hwmon/adm1021.c
+++ b/drivers/hwmon/adm1021.c
@@ -24,9 +24,9 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
 #include <linux/hwmon.h>
 #include <linux/err.h>
+#include <linux/mutex.h>
 
 
 /* Addresses to scan */
@@ -36,7 +36,7 @@ static unsigned short normal_i2c[] = { 0x18, 0x19, 0x1a,
                                        I2C_CLIENT_END };
 
 /* Insmod parameters */
-SENSORS_INSMOD_8(adm1021, adm1023, max1617, max1617a, thmc10, lm84, gl523sm, mc1066);
+I2C_CLIENT_INSMOD_8(adm1021, adm1023, max1617, max1617a, thmc10, lm84, gl523sm, mc1066);
 
 /* adm1021 constants specified below */
 
@@ -93,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 */
 
@@ -122,15 +122,15 @@ static int adm1021_write_value(struct i2c_client *client, u8 reg,
 static struct adm1021_data *adm1021_update_device(struct device *dev);
 
 /* (amalysh) read only mode, otherwise any limit's writing confuse BIOS */
-static int read_only = 0;
+static int read_only;
 
 
 /* This is the driver that will be inserted */
 static struct i2c_driver adm1021_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "adm1021",
+       .driver = {
+               .name   = "adm1021",
+       },
        .id             = I2C_DRIVERID_ADM1021,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = adm1021_attach_adapter,
        .detach_client  = adm1021_detach_client,
 };
@@ -163,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);
@@ -187,7 +187,7 @@ static int adm1021_attach_adapter(struct i2c_adapter *adapter)
 {
        if (!(adapter->class & I2C_CLASS_HWMON))
                return 0;
-       return i2c_detect(adapter, &addr_data, adm1021_detect);
+       return i2c_probe(adapter, &addr_data, adm1021_detect);
 }
 
 static int adm1021_detect(struct i2c_adapter *adapter, int address, int kind)
@@ -205,11 +205,10 @@ static int adm1021_detect(struct i2c_adapter *adapter, int address, int kind)
           client structure, even though we cannot fill it completely yet.
           But it allows us to access adm1021_{read,write}_value. */
 
-       if (!(data = kmalloc(sizeof(struct adm1021_data), GFP_KERNEL))) {
+       if (!(data = kzalloc(sizeof(struct adm1021_data), GFP_KERNEL))) {
                err = -ENOMEM;
                goto error0;
        }
-       memset(data, 0, sizeof(struct adm1021_data));
 
        new_client = &data->client;
        i2c_set_clientdata(new_client, data);
@@ -277,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)))
@@ -353,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) {
@@ -377,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;
 }