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, 7 insertions, 22 deletions

diff --git a/drivers/hwmon/gl518sm.c b/drivers/hwmon/gl518sm.c
index 7820df45d77a..1d69458aa0b6 100644
--- a/drivers/hwmon/gl518sm.c
+++ b/drivers/hwmon/gl518sm.c
@@ -488,36 +488,21 @@ static int gl518_detect(struct i2c_client *client, int kind,
                         struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
-        int i;
+        int rev;
 
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA |
                                      I2C_FUNC_SMBUS_WORD_DATA))
                 return -ENODEV;
 
         /* Now, we do the remaining detection. */
-
-        if (kind < 0) {
-                if ((gl518_read_value(client, GL518_REG_CHIP_ID) != 0x80)
-                 || (gl518_read_value(client, GL518_REG_CONF) & 0x80))
-                        return -ENODEV;
-        }
+        if ((gl518_read_value(client, GL518_REG_CHIP_ID) != 0x80)
+         || (gl518_read_value(client, GL518_REG_CONF) & 0x80))
+                return -ENODEV;
 
         /* Determine the chip type. */
-        if (kind <= 0) {
-                i = gl518_read_value(client, GL518_REG_REVISION);
-                if (i == 0x00) {
-                        kind = gl518sm_r00;
-                } else if (i == 0x80) {
-                        kind = gl518sm_r80;
-                } else {
-                        if (kind <= 0)
-                                dev_info(&adapter->dev,
-                                    "Ignoring 'force' parameter for unknown "
-                                    "chip at adapter %d, address 0x%02x\n",
-                                    i2c_adapter_id(adapter), client->addr);
-                        return -ENODEV;
-                }
-        }
+        rev = gl518_read_value(client, GL518_REG_REVISION);
+        if (rev != 0x00 && rev != 0x80)
+                return -ENODEV;
 
         strlcpy(info->type, "gl518sm", I2C_NAME_SIZE);