MIPS: R2: Fix local_irq_save()

[linux-2.6-omap-h63xx.git] / drivers / hwmon / max1619.c

diff --git a/drivers/hwmon/max1619.c b/drivers/hwmon/max1619.c
index 3c159f1d49ee3e6e0bf6b8acd5ccbfa8093ec938..3abe330b22ce1d8b3d32a15618cf0926c3084c84 100644 (file)
--- a/drivers/hwmon/max1619.c
+++ b/drivers/hwmon/max1619.c
@@ -31,20 +31,19 @@
 #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>
 
 static unsigned short normal_i2c[] = { 0x18, 0x19, 0x1a,
                                        0x29, 0x2a, 0x2b,
                                        0x4c, 0x4d, 0x4e,
                                        I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /*
  * Insmod parameters
  */
 
-SENSORS_INSMOD_1(max1619);
+I2C_CLIENT_INSMOD_1(max1619);
 
 /*
  * The MAX1619 registers
@@ -91,9 +90,9 @@ static struct max1619_data *max1619_update_device(struct device *dev);
  */
 
 static struct i2c_driver max1619_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "max1619",
-       .flags          = I2C_DF_NOTIFY,
+       .driver = {
+               .name   = "max1619",
+       },
        .attach_adapter = max1619_attach_adapter,
        .detach_client  = max1619_detach_client,
 };
@@ -104,6 +103,7 @@ static struct i2c_driver max1619_driver = {
 
 struct max1619_data {
        struct i2c_client client;
+       struct class_device *class_dev;
        struct semaphore update_lock;
        char valid; /* zero until following fields are valid */
        unsigned long last_updated; /* in jiffies */
@@ -179,7 +179,7 @@ static int max1619_attach_adapter(struct i2c_adapter *adapter)
 {
        if (!(adapter->class & I2C_CLASS_HWMON))
                return 0;
-       return i2c_detect(adapter, &addr_data, max1619_detect);
+       return i2c_probe(adapter, &addr_data, max1619_detect);
 }
 
 /*
@@ -193,15 +193,14 @@ static int max1619_detect(struct i2c_adapter *adapter, int address, int kind)
        int err = 0;
        const char *name = "";  
        u8 reg_config=0, reg_convrate=0, reg_status=0;
-       u8 man_id, chip_id;
+
        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                goto exit;
 
-       if (!(data = kmalloc(sizeof(struct max1619_data), GFP_KERNEL))) {
+       if (!(data = kzalloc(sizeof(struct max1619_data), GFP_KERNEL))) {
                err = -ENOMEM;
                goto exit;
        }
-       memset(data, 0, sizeof(struct max1619_data));
 
        /* The common I2C client data is placed right before the
           MAX1619-specific data. */
@@ -239,16 +238,15 @@ static int max1619_detect(struct i2c_adapter *adapter, int address, int kind)
        }
 
        if (kind <= 0) { /* identification */
+               u8 man_id, chip_id;
        
                man_id = i2c_smbus_read_byte_data(new_client,
                         MAX1619_REG_R_MAN_ID);
                chip_id = i2c_smbus_read_byte_data(new_client,
                          MAX1619_REG_R_CHIP_ID);
                
-               if ((man_id == 0x4D) && (chip_id == 0x04)){  
-                               kind = max1619;
-                       }
-               }
+               if ((man_id == 0x4D) && (chip_id == 0x04))
+                       kind = max1619;
 
                if (kind <= 0) { /* identification failed */
                        dev_info(&adapter->dev,
@@ -256,11 +254,10 @@ static int max1619_detect(struct i2c_adapter *adapter, int address, int kind)
                            "chip_id=0x%02X).\n", man_id, chip_id);
                        goto exit_free;
                }
-       
+       }
 
-       if (kind == max1619){
+       if (kind == max1619)
                name = "max1619";
-       }
 
        /* We can fill in the remaining client fields */
        strlcpy(new_client->name, name, I2C_NAME_SIZE);
@@ -275,6 +272,12 @@ static int max1619_detect(struct i2c_adapter *adapter, int address, int kind)
        max1619_init_client(new_client);
 
        /* Register sysfs hooks */
+       data->class_dev = hwmon_device_register(&new_client->dev);
+       if (IS_ERR(data->class_dev)) {
+               err = PTR_ERR(data->class_dev);
+               goto exit_detach;
+       }
+
        device_create_file(&new_client->dev, &dev_attr_temp1_input);
        device_create_file(&new_client->dev, &dev_attr_temp2_input);
        device_create_file(&new_client->dev, &dev_attr_temp2_min);
@@ -285,6 +288,8 @@ static int max1619_detect(struct i2c_adapter *adapter, int address, int kind)
 
        return 0;
 
+exit_detach:
+       i2c_detach_client(new_client);
 exit_free:
        kfree(data);
 exit:
@@ -308,15 +313,15 @@ static void max1619_init_client(struct i2c_client *client)
 
 static int max1619_detach_client(struct i2c_client *client)
 {
+       struct max1619_data *data = i2c_get_clientdata(client);
        int err;
 
-       if ((err = i2c_detach_client(client))) {
-               dev_err(&client->dev, "Client deregistration failed, "
-                       "client not detached.\n");
+       hwmon_device_unregister(data->class_dev);
+
+       if ((err = i2c_detach_client(client)))
                return err;
-       }
 
-       kfree(i2c_get_clientdata(client));
+       kfree(data);
        return 0;
 }