Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: (41 commits)
  hwmon: (adt7475) Add VID support for the ADT7476
  hwmon: (adt7475) Add an entry in MAINTAINERS
  hwmon: (adt7475) Add support for the ADT7476
  hwmon: (adt7475) Voltage attenuators can be bypassed
  hwmon: (adt7475) Print device information on probe
  hwmon: (adt7475) Handle alternative pin functions
  hwmon: (adt7475) Move sysfs files removal to a separate function
  hwmon: (adt7475) Add support for the ADT7490
  hwmon: (adt7475) Improve device detection
  hwmon: (adt7475) Add missing static marker
  hwmon: (adt7475) Rework voltage inputs handling
  hwmon: (adt7475) Implement pwm_use_point2_pwm_at_crit
  hwmon: (adt7475) New documentation
  hwmon: (adt7475) Add support for the ADT7473
  hwmon: (f71882fg) Add support for the f71889fg (version 2)
  hwmon: (f71882fg) Fix sysfs file removal
  hwmon: (f71882fg) Cleanup sysfs attr creation 2/2
  hwmon: (f71882fg) Cleanup sysfs attr creation 1/2
  hwmon: (thmc50) Stop using I2C_CLIENT_MODULE_PARM
  hwmon: Add Freescale MC13783 ADC driver
  ...

1 files changed, 21 insertions, 24 deletions

diff --git a/drivers/hwmon/tmp421.c b/drivers/hwmon/tmp421.c
index 20924343431b..bb5464a289ca 100644
--- a/drivers/hwmon/tmp421.c
+++ b/drivers/hwmon/tmp421.c
@@ -223,39 +223,36 @@ static int tmp421_init_client(struct i2c_client *client)
         return 0;
 }
 
-static int tmp421_detect(struct i2c_client *client, int kind,
+static int tmp421_detect(struct i2c_client *client, int _kind,
                          struct i2c_board_info *info)
 {
+        enum chips kind;
         struct i2c_adapter *adapter = client->adapter;
         const char *names[] = { "TMP421", "TMP422", "TMP423" };
+        u8 reg;
 
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                 return -ENODEV;
 
-        if (kind <= 0) {
-                u8 reg;
-
-                reg = i2c_smbus_read_byte_data(client,
-                                               TMP421_MANUFACTURER_ID_REG);
-                if (reg != TMP421_MANUFACTURER_ID)
-                        return -ENODEV;
-
-                reg = i2c_smbus_read_byte_data(client,
-                                               TMP421_DEVICE_ID_REG);
-                switch (reg) {
-                case TMP421_DEVICE_ID:
-                        kind = tmp421;
-                        break;
-                case TMP422_DEVICE_ID:
-                        kind = tmp422;
-                        break;
-                case TMP423_DEVICE_ID:
-                        kind = tmp423;
-                        break;
-                default:
-                        return -ENODEV;
-                }
+        reg = i2c_smbus_read_byte_data(client, TMP421_MANUFACTURER_ID_REG);
+        if (reg != TMP421_MANUFACTURER_ID)
+                return -ENODEV;
+
+        reg = i2c_smbus_read_byte_data(client, TMP421_DEVICE_ID_REG);
+        switch (reg) {
+        case TMP421_DEVICE_ID:
+                kind = tmp421;
+                break;
+        case TMP422_DEVICE_ID:
+                kind = tmp422;
+                break;
+        case TMP423_DEVICE_ID:
+                kind = tmp423;
+                break;
+        default:
+                return -ENODEV;
         }
+
         strlcpy(info->type, tmp421_id[kind - 1].name, I2C_NAME_SIZE);
         dev_info(&adapter->dev, "Detected TI %s chip at 0x%02x\n",
                  names[kind - 1], client->addr);