1 files changed, 21 insertions, 50 deletions

diff --git a/drivers/hwmon/adm1029.c b/drivers/hwmon/adm1029.c
index 36718150b475..0b8a3b145bd2 100644
--- a/drivers/hwmon/adm1029.c
+++ b/drivers/hwmon/adm1029.c
@@ -44,12 +44,6 @@ static const unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d,
 };
 
 /*
- * Insmod parameters
- */
-
-I2C_CLIENT_INSMOD_1(adm1029);
-
-/*
  * The ADM1029 registers
  * Manufacturer ID is 0x41 for Analog Devices
  */
@@ -117,7 +111,7 @@ static const u8 ADM1029_REG_FAN_DIV[] = {
 
 static int adm1029_probe(struct i2c_client *client,
                          const struct i2c_device_id *id);
-static int adm1029_detect(struct i2c_client *client, int kind,
+static int adm1029_detect(struct i2c_client *client,
                           struct i2c_board_info *info);
 static int adm1029_remove(struct i2c_client *client);
 static struct adm1029_data *adm1029_update_device(struct device *dev);
@@ -128,7 +122,7 @@ static int adm1029_init_client(struct i2c_client *client);
  */
 
 static const struct i2c_device_id adm1029_id[] = {
-        { "adm1029", adm1029 },
+        { "adm1029", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, adm1029_id);
@@ -142,7 +136,7 @@ static struct i2c_driver adm1029_driver = {
         .remove         = adm1029_remove,
         .id_table       = adm1029_id,
         .detect         = adm1029_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 /*
@@ -297,63 +291,40 @@ static const struct attribute_group adm1029_group = {
  */
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int adm1029_detect(struct i2c_client *client, int kind,
+static int adm1029_detect(struct i2c_client *client,
                           struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
+        u8 man_id, chip_id, temp_devices_installed, nb_fan_support;
 
         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, adm1029).
-         * 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 adm1029 if forced */
-        if (kind == 0)
-                kind = adm1029;
-
         /* ADM1029 doesn't have CHIP ID, check just MAN ID
          * For better detection we check also ADM1029_TEMP_DEVICES_INSTALLED,
          * ADM1029_REG_NB_FAN_SUPPORT and compare it with possible values
          * documented
          */
 
-        if (kind <= 0) {        /* identification */
-                u8 man_id, chip_id, temp_devices_installed, nb_fan_support;
-
-                man_id = i2c_smbus_read_byte_data(client, ADM1029_REG_MAN_ID);
-                chip_id = i2c_smbus_read_byte_data(client, ADM1029_REG_CHIP_ID);
-                temp_devices_installed = i2c_smbus_read_byte_data(client,
+        man_id = i2c_smbus_read_byte_data(client, ADM1029_REG_MAN_ID);
+        chip_id = i2c_smbus_read_byte_data(client, ADM1029_REG_CHIP_ID);
+        temp_devices_installed = i2c_smbus_read_byte_data(client,
                                         ADM1029_REG_TEMP_DEVICES_INSTALLED);
-                nb_fan_support = i2c_smbus_read_byte_data(client,
+        nb_fan_support = i2c_smbus_read_byte_data(client,
                                                 ADM1029_REG_NB_FAN_SUPPORT);
-                /* 0x41 is Analog Devices */
-                if (man_id == 0x41 && (temp_devices_installed & 0xf9) == 0x01
-                    && nb_fan_support == 0x03) {
-                        if ((chip_id & 0xF0) == 0x00) {
-                                kind = adm1029;
-                        } else {
-                                /* There are no "official" CHIP ID, so actually
-                                 * we use Major/Minor revision for that */
-                                printk(KERN_INFO
-                                       "adm1029: Unknown major revision %x, "
-                                       "please let us know\n", chip_id);
-                        }
-                }
+        /* 0x41 is Analog Devices */
+        if (man_id != 0x41 || (temp_devices_installed & 0xf9) != 0x01
+            || nb_fan_support != 0x03)
+                return -ENODEV;
 
-                if (kind <= 0) {        /* identification failed */
-                        pr_debug("adm1029: Unsupported chip (man_id=0x%02X, "
-                                 "chip_id=0x%02X)\n", man_id, chip_id);
-                        return -ENODEV;
-                }
+        if ((chip_id & 0xF0) != 0x00) {
+                /* There are no "official" CHIP ID, so actually
+                 * we use Major/Minor revision for that */
+                pr_info("adm1029: Unknown major revision %x, "
+                        "please let us know\n", chip_id);
+                return -ENODEV;
         }
+
         strlcpy(info->type, "adm1029", I2C_NAME_SIZE);
 
         return 0;
@@ -432,7 +403,7 @@ static int adm1029_remove(struct i2c_client *client)
 }
 
 /*
-function that update the status of the chips (temperature for exemple)
+function that update the status of the chips (temperature for example)
 */
 static struct adm1029_data *adm1029_update_device(struct device *dev)
 {