1 files changed, 7 insertions, 19 deletions

diff --git a/drivers/hwmon/adm1031.c b/drivers/hwmon/adm1031.c
index 56905955352..0e722175aae 100644
--- a/drivers/hwmon/adm1031.c
+++ b/drivers/hwmon/adm1031.c
@@ -817,31 +817,19 @@ static int adm1031_detect(struct i2c_client *client, int kind,
                           struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
-        const char *name = "";
+        const char *name;
+        int id, co;
 
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                 return -ENODEV;
 
-        if (kind < 0) {
-                int id, co;
-                id = i2c_smbus_read_byte_data(client, 0x3d);
-                co = i2c_smbus_read_byte_data(client, 0x3e);
+        id = i2c_smbus_read_byte_data(client, 0x3d);
+        co = i2c_smbus_read_byte_data(client, 0x3e);
 
-                if (!((id == 0x31 || id == 0x30) && co == 0x41))
-                        return -ENODEV;
-                kind = (id == 0x30) ? adm1030 : adm1031;
-        }
-
-        if (kind <= 0)
-                kind = adm1031;
+        if (!((id == 0x31 || id == 0x30) && co == 0x41))
+                return -ENODEV;
+        name = (id == 0x30) ? "adm1030" : "adm1031";
 
-        /* Given the detected chip type, set the chip name and the
-         * auto fan control helper table. */
-        if (kind == adm1030) {
-                name = "adm1030";
-        } else if (kind == adm1031) {
-                name = "adm1031";
-        }
         strlcpy(info->type, name, I2C_NAME_SIZE);
 
         return 0;