1 files changed, 14 insertions, 26 deletions

diff --git a/drivers/hwmon/lm92.c b/drivers/hwmon/lm92.c
index b2e00c5a7eec..7c31e6205f85 100644
--- a/drivers/hwmon/lm92.c
+++ b/drivers/hwmon/lm92.c
@@ -54,9 +54,6 @@
 static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b,
                                                 I2C_CLIENT_END };
 
-/* Insmod parameters */
-I2C_CLIENT_INSMOD_1(lm92);
-
 /* The LM92 registers */
 #define LM92_REG_CONFIG                 0x01 /* 8-bit, RW */
 #define LM92_REG_TEMP                   0x00 /* 16-bit, RO */
@@ -319,35 +316,26 @@ static const struct attribute_group lm92_group = {
 };
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int lm92_detect(struct i2c_client *new_client, int kind,
+static int lm92_detect(struct i2c_client *new_client,
                        struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = new_client->adapter;
+        u8 config;
+        u16 man_id;
 
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA
                                             | I2C_FUNC_SMBUS_WORD_DATA))
                 return -ENODEV;
 
-        /* A negative kind means that the driver was loaded with no force
-           parameter (default), so we must identify the chip. */
-        if (kind < 0) {
-                u8 config = i2c_smbus_read_byte_data(new_client,
-                             LM92_REG_CONFIG);
-                u16 man_id = i2c_smbus_read_word_data(new_client,
-                             LM92_REG_MAN_ID);
-
-                if ((config & 0xe0) == 0x00
-                 && man_id == 0x0180) {
-                        pr_info("lm92: Found National Semiconductor LM92 chip\n");
-                        kind = lm92;
-                } else
-                if (max6635_check(new_client)) {
-                        pr_info("lm92: Found Maxim MAX6635 chip\n");
-                        kind = lm92; /* No separate prefix */
-                }
-                else
-                        return -ENODEV;
-        }
+        config = i2c_smbus_read_byte_data(new_client, LM92_REG_CONFIG);
+        man_id = i2c_smbus_read_word_data(new_client, LM92_REG_MAN_ID);
+
+        if ((config & 0xe0) == 0x00 && man_id == 0x0180)
+                pr_info("lm92: Found National Semiconductor LM92 chip\n");
+        else if (max6635_check(new_client))
+                pr_info("lm92: Found Maxim MAX6635 chip\n");
+        else
+                return -ENODEV;
 
         strlcpy(info->type, "lm92", I2C_NAME_SIZE);
 
@@ -410,7 +398,7 @@ static int lm92_remove(struct i2c_client *client)
  */
 
 static const struct i2c_device_id lm92_id[] = {
-        { "lm92", lm92 },
+        { "lm92", 0 },
         /* max6635 could be added here */
         { }
 };
@@ -425,7 +413,7 @@ static struct i2c_driver lm92_driver = {
         .remove         = lm92_remove,
         .id_table       = lm92_id,
         .detect         = lm92_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 static int __init sensors_lm92_init(void)