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, 11 insertions, 21 deletions

diff --git a/drivers/hwmon/lm93.c b/drivers/hwmon/lm93.c
index fc36cadf36fb..495e7ce6f8a1 100644
--- a/drivers/hwmon/lm93.c
+++ b/drivers/hwmon/lm93.c
@@ -2505,34 +2505,24 @@ static int lm93_detect(struct i2c_client *client, int kind,
                        struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
+        int mfr, ver;
 
         if (!i2c_check_functionality(adapter, LM93_SMBUS_FUNC_MIN))
                 return -ENODEV;
 
         /* detection */
-        if (kind < 0) {
-                int mfr = lm93_read_byte(client, LM93_REG_MFR_ID);
-
-                if (mfr != 0x01) {
-                        dev_dbg(&adapter->dev,"detect failed, "
-                                "bad manufacturer id 0x%02x!\n", mfr);
-                        return -ENODEV;
-                }
+        mfr = lm93_read_byte(client, LM93_REG_MFR_ID);
+        if (mfr != 0x01) {
+                dev_dbg(&adapter->dev,
+                        "detect failed, bad manufacturer id 0x%02x!\n", mfr);
+                return -ENODEV;
         }
 
-        if (kind <= 0) {
-                int ver = lm93_read_byte(client, LM93_REG_VER);
-
-                if ((ver == LM93_MFR_ID) || (ver == LM93_MFR_ID_PROTOTYPE)) {
-                        kind = lm93;
-                } else {
-                        dev_dbg(&adapter->dev,"detect failed, "
-                                "bad version id 0x%02x!\n", ver);
-                        if (kind == 0)
-                                dev_dbg(&adapter->dev,
-                                        "(ignored 'force' parameter)\n");
-                        return -ENODEV;
-                }
+        ver = lm93_read_byte(client, LM93_REG_VER);
+        if (ver != LM93_MFR_ID && ver != LM93_MFR_ID_PROTOTYPE) {
+                dev_dbg(&adapter->dev,
+                        "detect failed, bad version id 0x%02x!\n", ver);
+                return -ENODEV;
         }
 
         strlcpy(info->type, "lm93", I2C_NAME_SIZE);