Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 23 insertions, 53 deletions

diff --git a/drivers/hwmon/max1619.c b/drivers/hwmon/max1619.c
index 7897754f3a5c..022ded098100 100644
--- a/drivers/hwmon/max1619.c
+++ b/drivers/hwmon/max1619.c
@@ -41,12 +41,6 @@ static const unsigned short normal_i2c[] = {
         0x18, 0x19, 0x1a, 0x29, 0x2a, 0x2b, 0x4c, 0x4d, 0x4e, I2C_CLIENT_END };
 
 /*
- * Insmod parameters
- */
-
-I2C_CLIENT_INSMOD_1(max1619);
-
-/*
  * The MAX1619 registers
  */
 
@@ -88,7 +82,7 @@ static int temp_to_reg(int val)
 
 static int max1619_probe(struct i2c_client *client,
                          const struct i2c_device_id *id);
-static int max1619_detect(struct i2c_client *client, int kind,
+static int max1619_detect(struct i2c_client *client,
                           struct i2c_board_info *info);
 static void max1619_init_client(struct i2c_client *client);
 static int max1619_remove(struct i2c_client *client);
@@ -99,7 +93,7 @@ static struct max1619_data *max1619_update_device(struct device *dev);
  */
 
 static const struct i2c_device_id max1619_id[] = {
-        { "max1619", max1619 },
+        { "max1619", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, max1619_id);
@@ -113,7 +107,7 @@ static struct i2c_driver max1619_driver = {
         .remove         = max1619_remove,
         .id_table       = max1619_id,
         .detect         = max1619_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 /*
@@ -226,58 +220,34 @@ static const struct attribute_group max1619_group = {
  */
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int max1619_detect(struct i2c_client *new_client, int kind,
+static int max1619_detect(struct i2c_client *client,
                           struct i2c_board_info *info)
 {
-        struct i2c_adapter *adapter = new_client->adapter;
-        u8 reg_config=0, reg_convrate=0, reg_status=0;
+        struct i2c_adapter *adapter = client->adapter;
+        u8 reg_config, reg_convrate, reg_status, man_id, chip_id;
 
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                 return -ENODEV;
 
-        /*
-         * Now we do the remaining detection. A negative kind means that
-         * the driver was loaded with no force parameter (default), so we
-         * must both detect and identify the chip. A zero kind means that
-         * the driver was loaded with the force parameter, the detection
-         * step shall be skipped. A positive kind means that the driver
-         * was loaded with the force parameter and a given kind of chip is
-         * requested, so both the detection and the identification steps
-         * are skipped.
-         */
-        if (kind < 0) { /* detection */
-                reg_config = i2c_smbus_read_byte_data(new_client,
-                              MAX1619_REG_R_CONFIG);
-                reg_convrate = i2c_smbus_read_byte_data(new_client,
-                               MAX1619_REG_R_CONVRATE);
-                reg_status = i2c_smbus_read_byte_data(new_client,
-                                MAX1619_REG_R_STATUS);
-                if ((reg_config & 0x03) != 0x00
-                 || reg_convrate > 0x07 || (reg_status & 0x61 ) !=0x00) {
-                        dev_dbg(&adapter->dev,
-                                "MAX1619 detection failed at 0x%02x.\n",
-                                new_client->addr);
-                        return -ENODEV;
-                }
+        /* detection */
+        reg_config = i2c_smbus_read_byte_data(client, MAX1619_REG_R_CONFIG);
+        reg_convrate = i2c_smbus_read_byte_data(client, MAX1619_REG_R_CONVRATE);
+        reg_status = i2c_smbus_read_byte_data(client, MAX1619_REG_R_STATUS);
+        if ((reg_config & 0x03) != 0x00
+         || reg_convrate > 0x07 || (reg_status & 0x61) != 0x00) {
+                dev_dbg(&adapter->dev, "MAX1619 detection failed at 0x%02x\n",
+                        client->addr);
+                return -ENODEV;
         }
 
-        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 (kind <= 0) { /* identification failed */
-                        dev_info(&adapter->dev,
-                            "Unsupported chip (man_id=0x%02X, "
-                            "chip_id=0x%02X).\n", man_id, chip_id);
-                        return -ENODEV;
-                }
+        /* identification */
+        man_id = i2c_smbus_read_byte_data(client, MAX1619_REG_R_MAN_ID);
+        chip_id = i2c_smbus_read_byte_data(client, MAX1619_REG_R_CHIP_ID);
+        if (man_id != 0x4D || chip_id != 0x04) {
+                dev_info(&adapter->dev,
+                         "Unsupported chip (man_id=0x%02X, chip_id=0x%02X).\n",
+                         man_id, chip_id);
+                return -ENODEV;
         }
 
         strlcpy(info->type, "max1619", I2C_NAME_SIZE);