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/dme1737.c b/drivers/hwmon/dme1737.c
index 27d62574284f..4377bb0cc526 100644
--- a/drivers/hwmon/dme1737.c
+++ b/drivers/hwmon/dme1737.c
@@ -2220,33 +2220,23 @@ static int dme1737_i2c_detect(struct i2c_client *client, int kind,
                 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) {
-                company = i2c_smbus_read_byte_data(client, DME1737_REG_COMPANY);
-                verstep = i2c_smbus_read_byte_data(client, DME1737_REG_VERSTEP);
-
-                if (company == DME1737_COMPANY_SMSC &&
-                    (verstep & DME1737_VERSTEP_MASK) == DME1737_VERSTEP) {
-                        kind = dme1737;
-                } else if (company == DME1737_COMPANY_SMSC &&
-                           verstep == SCH5027_VERSTEP) {
-                        kind = sch5027;
-                } else {
-                        return -ENODEV;
-                }
-        }
+        company = i2c_smbus_read_byte_data(client, DME1737_REG_COMPANY);
+        verstep = i2c_smbus_read_byte_data(client, DME1737_REG_VERSTEP);
 
-        if (kind == sch5027) {
+        if (company == DME1737_COMPANY_SMSC &&
+            verstep == SCH5027_VERSTEP) {
                 name = "sch5027";
-        } else {
-                kind = dme1737;
+
+        } else if (company == DME1737_COMPANY_SMSC &&
+                   (verstep & DME1737_VERSTEP_MASK) == DME1737_VERSTEP) {
                 name = "dme1737";
+        } else {
+                return -ENODEV;
         }
 
         dev_info(dev, "Found a %s chip at 0x%02x (rev 0x%02x).\n",
-                 kind == sch5027 ? "SCH5027" : "DME1737", client->addr,
-                 verstep);
+                 verstep == SCH5027_VERSTEP ? "SCH5027" : "DME1737",
+                 client->addr, verstep);
         strlcpy(info->type, name, I2C_NAME_SIZE);
 
         return 0;