ics932s401: Clean up detect function

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: "Darrick J. Wong" <djwong@us.ibm.com>

diff --git a/drivers/misc/ics932s401.c b/drivers/misc/ics932s401.c
index 6e43ab4..4bb7a3a 100644 (file)
--- a/drivers/misc/ics932s401.c
+++ b/drivers/misc/ics932s401.c
@@ -417,32 +417,25 @@ static int ics932s401_detect(struct i2c_client *client, int kind,
                          struct i2c_board_info *info)
 {
        struct i2c_adapter *adapter = client->adapter;
+       int vendor, device, revision;
 
        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                return -ENODEV;
 
-       if (kind <= 0) {
-               int vendor, device, revision;
-
-               vendor = i2c_smbus_read_word_data(client,
-                                                 ICS932S401_REG_VENDOR_REV);
-               vendor >>= 8;
-               revision = vendor >> ICS932S401_REV_SHIFT;
-               vendor &= ICS932S401_VENDOR_MASK;
-               if (vendor != ICS932S401_VENDOR)
-                       return -ENODEV;
-
-               device = i2c_smbus_read_word_data(client,
-                                                 ICS932S401_REG_DEVICE);
-               device >>= 8;
-               if (device != ICS932S401_DEVICE)
-                       return -ENODEV;
-
-               if (revision != ICS932S401_REV)
-                       dev_info(&adapter->dev, "Unknown revision %d\n",
-                                revision);
-       } else
-               dev_dbg(&adapter->dev, "detection forced\n");
+       vendor = i2c_smbus_read_word_data(client, ICS932S401_REG_VENDOR_REV);
+       vendor >>= 8;
+       revision = vendor >> ICS932S401_REV_SHIFT;
+       vendor &= ICS932S401_VENDOR_MASK;
+       if (vendor != ICS932S401_VENDOR)
+               return -ENODEV;
+
+       device = i2c_smbus_read_word_data(client, ICS932S401_REG_DEVICE);
+       device >>= 8;
+       if (device != ICS932S401_DEVICE)
+               return -ENODEV;
+
+       if (revision != ICS932S401_REV)
+               dev_info(&adapter->dev, "Unknown revision %d\n", revision);
 
        strlcpy(info->type, "ics932s401", I2C_NAME_SIZE);