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, 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;