hwmon: Clean up detect functions

As kind is now hard-coded to -1, there is room for code clean-ups.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Corentin Labbe <corentin.labbe@geomatys.fr>
Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>
Cc: Juerg Haefliger <juergh@gmail.com>
Cc: Riku Voipio <riku.voipio@iki.fi>
Acked-by: "Hans J. Koch" <hjk@linutronix.de>
Cc: Rudolf Marek <r.marek@assembler.cz>

1 files changed, 18 insertions, 23 deletions

diff --git a/drivers/hwmon/lm87.c b/drivers/hwmon/lm87.c
index 2e4a3cea95f7..4929b1815eee 100644
--- a/drivers/hwmon/lm87.c
+++ b/drivers/hwmon/lm87.c
@@ -666,37 +666,32 @@ static int lm87_detect(struct i2c_client *new_client, int kind,
                        struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = new_client->adapter;
-        static const char *names[] = { "lm87", "adm1024" };
+        const char *name;
+        u8 cid, rev;
 
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                 return -ENODEV;
 
-        /* Default to an LM87 if forced */
-        if (kind == 0)
-                kind = lm87;
+        if (lm87_read_value(new_client, LM87_REG_CONFIG) & 0x80)
+                return -ENODEV;
 
         /* Now, we do the remaining detection. */
-        if (kind < 0) {
-                u8 cid = lm87_read_value(new_client, LM87_REG_COMPANY_ID);
-                u8 rev = lm87_read_value(new_client, LM87_REG_REVISION);
-
-                if (cid == 0x02                 /* National Semiconductor */
-                 && (rev >= 0x01 && rev <= 0x08))
-                        kind = lm87;
-                else if (cid == 0x41            /* Analog Devices */
-                      && (rev & 0xf0) == 0x10)
-                        kind = adm1024;
-
-                if (kind < 0
-                 || (lm87_read_value(new_client, LM87_REG_CONFIG) & 0x80)) {
-                        dev_dbg(&adapter->dev,
-                                "LM87 detection failed at 0x%02x.\n",
-                                new_client->addr);
-                        return -ENODEV;
-                }
+        cid = lm87_read_value(new_client, LM87_REG_COMPANY_ID);
+        rev = lm87_read_value(new_client, LM87_REG_REVISION);
+
+        if (cid == 0x02                 /* National Semiconductor */
+         && (rev >= 0x01 && rev <= 0x08))
+                name = "lm87";
+        else if (cid == 0x41            /* Analog Devices */
+              && (rev & 0xf0) == 0x10)
+                name = "adm1024";
+        else {
+                dev_dbg(&adapter->dev, "LM87 detection failed at 0x%02x\n",
+                        new_client->addr);
+                return -ENODEV;
         }
 
-        strlcpy(info->type, names[kind - 1], I2C_NAME_SIZE);
+        strlcpy(info->type, name, I2C_NAME_SIZE);
 
         return 0;
 }