1 files changed, 24 insertions, 61 deletions

diff --git a/drivers/hwmon/adm1025.c b/drivers/hwmon/adm1025.c
index 4db04d603ec9..251b63165e2a 100644
--- a/drivers/hwmon/adm1025.c
+++ b/drivers/hwmon/adm1025.c
@@ -2,7 +2,7 @@
  * adm1025.c
  *
  * Copyright (C) 2000       Chen-Yuan Wu <gwu@esoft.com>
- * Copyright (C) 2003-2008  Jean Delvare <khali@linux-fr.org>
+ * Copyright (C) 2003-2009  Jean Delvare <khali@linux-fr.org>
  *
  * The ADM1025 is a sensor chip made by Analog Devices. It reports up to 6
  * voltages (including its own power source) and up to two temperatures
@@ -64,11 +64,7 @@
 
 static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
 
-/*
- * Insmod parameters
- */
-
-I2C_CLIENT_INSMOD_2(adm1025, ne1619);
+enum chips { adm1025, ne1619 };
 
 /*
  * The ADM1025 registers
@@ -111,7 +107,7 @@ static const int in_scale[6] = { 2500, 2250, 3300, 5000, 12000, 3300 };
 
 static int adm1025_probe(struct i2c_client *client,
                          const struct i2c_device_id *id);
-static int adm1025_detect(struct i2c_client *client, int kind,
+static int adm1025_detect(struct i2c_client *client,
                           struct i2c_board_info *info);
 static void adm1025_init_client(struct i2c_client *client);
 static int adm1025_remove(struct i2c_client *client);
@@ -137,7 +133,7 @@ static struct i2c_driver adm1025_driver = {
         .remove         = adm1025_remove,
         .id_table       = adm1025_id,
         .detect         = adm1025_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 /*
@@ -409,71 +405,38 @@ static const struct attribute_group adm1025_group_in4 = {
 };
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int adm1025_detect(struct i2c_client *client, int kind,
+static int adm1025_detect(struct i2c_client *client,
                           struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
-        const char *name = "";
-        u8 config;
+        const char *name;
+        u8 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.
-         */
-        config = i2c_smbus_read_byte_data(client, ADM1025_REG_CONFIG);
-        if (kind < 0) { /* detection */
-                if ((config & 0x80) != 0x00
-                 || (i2c_smbus_read_byte_data(client,
-                     ADM1025_REG_STATUS1) & 0xC0) != 0x00
-                 || (i2c_smbus_read_byte_data(client,
-                     ADM1025_REG_STATUS2) & 0xBC) != 0x00) {
-                        dev_dbg(&adapter->dev,
-                                "ADM1025 detection failed at 0x%02x.\n",
-                                client->addr);
-                        return -ENODEV;
-                }
+        /* Check for unused bits */
+        if ((i2c_smbus_read_byte_data(client, ADM1025_REG_CONFIG) & 0x80)
+         || (i2c_smbus_read_byte_data(client, ADM1025_REG_STATUS1) & 0xC0)
+         || (i2c_smbus_read_byte_data(client, ADM1025_REG_STATUS2) & 0xBC)) {
+                dev_dbg(&adapter->dev, "ADM1025 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(client, ADM1025_REG_MAN_ID);
-                chip_id = i2c_smbus_read_byte_data(client, ADM1025_REG_CHIP_ID);
-
-                if (man_id == 0x41) { /* Analog Devices */
-                        if ((chip_id & 0xF0) == 0x20) { /* ADM1025/ADM1025A */
-                                kind = adm1025;
-                        }
-                } else
-                if (man_id == 0xA1) { /* Philips */
-                        if (client->addr != 0x2E
-                         && (chip_id & 0xF0) == 0x20) { /* NE1619 */
-                                kind = ne1619;
-                        }
-                }
-
-                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 */
+        chip_id = i2c_smbus_read_byte_data(client, ADM1025_REG_CHIP_ID);
+        if ((chip_id & 0xF0) != 0x20)
+                return -ENODEV;
 
-        if (kind == adm1025) {
+        man_id = i2c_smbus_read_byte_data(client, ADM1025_REG_MAN_ID);
+        if (man_id == 0x41)
                 name = "adm1025";
-        } else if (kind == ne1619) {
+        else if (man_id == 0xA1 && client->addr != 0x2E)
                 name = "ne1619";
-        }
+        else
+                return -ENODEV;
+
         strlcpy(info->type, name, I2C_NAME_SIZE);
 
         return 0;