1 files changed, 30 insertions, 63 deletions

diff --git a/drivers/hwmon/lm83.c b/drivers/hwmon/lm83.c
index e59e2d1f080c..8290476aee4a 100644
--- a/drivers/hwmon/lm83.c
+++ b/drivers/hwmon/lm83.c
@@ -1,7 +1,7 @@
 /*
  * lm83.c - Part of lm_sensors, Linux kernel modules for hardware
  *          monitoring
- * Copyright (C) 2003-2008  Jean Delvare <khali@linux-fr.org>
+ * Copyright (C) 2003-2009  Jean Delvare <khali@linux-fr.org>
  *
  * Heavily inspired from the lm78, lm75 and adm1021 drivers. The LM83 is
  * a sensor chip made by National Semiconductor. It reports up to four
@@ -51,11 +51,7 @@
 static const unsigned short normal_i2c[] = {
         0x18, 0x19, 0x1a, 0x29, 0x2a, 0x2b, 0x4c, 0x4d, 0x4e, I2C_CLIENT_END };
 
-/*
- * Insmod parameters
- */
-
-I2C_CLIENT_INSMOD_2(lm83, lm82);
+enum chips { lm83, lm82 };
 
 /*
  * The LM83 registers
@@ -118,7 +114,7 @@ static const u8 LM83_REG_W_HIGH[] = {
  * Functions declaration
  */
 
-static int lm83_detect(struct i2c_client *new_client, int kind,
+static int lm83_detect(struct i2c_client *new_client,
                        struct i2c_board_info *info);
 static int lm83_probe(struct i2c_client *client,
                       const struct i2c_device_id *id);
@@ -145,7 +141,7 @@ static struct i2c_driver lm83_driver = {
         .remove         = lm83_remove,
         .id_table       = lm83_id,
         .detect         = lm83_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 /*
@@ -291,73 +287,44 @@ static const struct attribute_group lm83_group_opt = {
  */
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int lm83_detect(struct i2c_client *new_client, int kind,
+static int lm83_detect(struct i2c_client *new_client,
                        struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = new_client->adapter;
-        const char *name = "";
+        const char *name;
+        u8 man_id, chip_id;
 
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                 return -ENODEV;
 
-        /* Now we do the detection and identification. A negative kind
-         * means that the driver was loaded with no force parameter
-         * (default), so we must both detect and identify the chip
-         * (actually there is only one possible kind of chip for now, LM83).
-         * 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. */
-
-        /* Default to an LM83 if forced */
-        if (kind == 0)
-                kind = lm83;
-
-        if (kind < 0) { /* detection */
-                if (((i2c_smbus_read_byte_data(new_client, LM83_REG_R_STATUS1)
-                    & 0xA8) != 0x00) ||
-                    ((i2c_smbus_read_byte_data(new_client, LM83_REG_R_STATUS2)
-                    & 0x48) != 0x00) ||
-                    ((i2c_smbus_read_byte_data(new_client, LM83_REG_R_CONFIG)
-                    & 0x41) != 0x00)) {
-                        dev_dbg(&adapter->dev,
-                                "LM83 detection failed at 0x%02x.\n",
-                                new_client->addr);
-                        return -ENODEV;
-                }
+        /* Detection */
+        if ((i2c_smbus_read_byte_data(new_client, LM83_REG_R_STATUS1) & 0xA8) ||
+            (i2c_smbus_read_byte_data(new_client, LM83_REG_R_STATUS2) & 0x48) ||
+            (i2c_smbus_read_byte_data(new_client, LM83_REG_R_CONFIG) & 0x41)) {
+                dev_dbg(&adapter->dev, "LM83 detection failed at 0x%02x\n",
+                        new_client->addr);
+                return -ENODEV;
         }
 
-        if (kind <= 0) { /* identification */
-                u8 man_id, chip_id;
-
-                man_id = i2c_smbus_read_byte_data(new_client,
-                    LM83_REG_R_MAN_ID);
-                chip_id = i2c_smbus_read_byte_data(new_client,
-                    LM83_REG_R_CHIP_ID);
-
-                if (man_id == 0x01) { /* National Semiconductor */
-                        if (chip_id == 0x03) {
-                                kind = lm83;
-                        } else
-                        if (chip_id == 0x01) {
-                                kind = lm82;
-                        }
-                }
-
-                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(new_client, LM83_REG_R_MAN_ID);
+        if (man_id != 0x01)     /* National Semiconductor */
+                return -ENODEV;
 
-        if (kind == lm83) {
+        chip_id = i2c_smbus_read_byte_data(new_client, LM83_REG_R_CHIP_ID);
+        switch (chip_id) {
+        case 0x03:
                 name = "lm83";
-        } else
-        if (kind == lm82) {
+                break;
+        case 0x01:
                 name = "lm82";
+                break;
+        default:
+                /* identification failed */
+                dev_info(&adapter->dev,
+                         "Unsupported chip (man_id=0x%02X, chip_id=0x%02X)\n",
+                         man_id, chip_id);
+                return -ENODEV;
         }
 
         strlcpy(info->type, name, I2C_NAME_SIZE);