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, 18 insertions, 43 deletions

diff --git a/drivers/hwmon/w83792d.c b/drivers/hwmon/w83792d.c
index 2be16194ddf3..38978851333f 100644
--- a/drivers/hwmon/w83792d.c
+++ b/drivers/hwmon/w83792d.c
@@ -1273,58 +1273,33 @@ w83792d_detect(struct i2c_client *client, int kind, struct i2c_board_info *info)
                 return -ENODEV;
         }
 
-        /* The w83792d may be stuck in some other bank than bank 0. This may
-           make reading other information impossible. Specify a force=... or
-           force_*=... parameter, and the Winbond will be reset to the right
-           bank. */
-        if (kind < 0) {
-                if (w83792d_read_value(client, W83792D_REG_CONFIG) & 0x80) {
-                        return -ENODEV;
-                }
-                val1 = w83792d_read_value(client, W83792D_REG_BANK);
-                val2 = w83792d_read_value(client, W83792D_REG_CHIPMAN);
-                /* Check for Winbond ID if in bank 0 */
-                if (!(val1 & 0x07)) {  /* is Bank0 */
-                        if (((!(val1 & 0x80)) && (val2 != 0xa3)) ||
-                             ((val1 & 0x80) && (val2 != 0x5c))) {
-                                return -ENODEV;
-                        }
-                }
-                /* If Winbond chip, address of chip and W83792D_REG_I2C_ADDR
-                   should match */
-                if (w83792d_read_value(client,
-                                        W83792D_REG_I2C_ADDR) != address) {
+        if (w83792d_read_value(client, W83792D_REG_CONFIG) & 0x80)
+                return -ENODEV;
+
+        val1 = w83792d_read_value(client, W83792D_REG_BANK);
+        val2 = w83792d_read_value(client, W83792D_REG_CHIPMAN);
+        /* Check for Winbond ID if in bank 0 */
+        if (!(val1 & 0x07)) {  /* is Bank0 */
+                if ((!(val1 & 0x80) && val2 != 0xa3) ||
+                    ( (val1 & 0x80) && val2 != 0x5c))
                         return -ENODEV;
-                }
         }
+        /* If Winbond chip, address of chip and W83792D_REG_I2C_ADDR
+           should match */
+        if (w83792d_read_value(client, W83792D_REG_I2C_ADDR) != address)
+                return -ENODEV;
 
-        /* We have either had a force parameter, or we have already detected the
-           Winbond. Put it now into bank 0 and Vendor ID High Byte */
+        /*  Put it now into bank 0 and Vendor ID High Byte */
         w83792d_write_value(client,
                             W83792D_REG_BANK,
                             (w83792d_read_value(client,
                                 W83792D_REG_BANK) & 0x78) | 0x80);
 
         /* Determine the chip type. */
-        if (kind <= 0) {
-                /* get vendor ID */
-                val2 = w83792d_read_value(client, W83792D_REG_CHIPMAN);
-                if (val2 != 0x5c) {  /* the vendor is NOT Winbond */
-                        return -ENODEV;
-                }
-                val1 = w83792d_read_value(client, W83792D_REG_WCHIPID);
-                if (val1 == 0x7a) {
-                        kind = w83792d;
-                } else {
-                        if (kind == 0)
-                                dev_warn(&adapter->dev,
-                                        "w83792d: Ignoring 'force' parameter for"
-                                        " unknown chip at adapter %d, address"
-                                        " 0x%02x\n", i2c_adapter_id(adapter),
-                                        address);
-                        return -ENODEV;
-                }
-        }
+        val1 = w83792d_read_value(client, W83792D_REG_WCHIPID);
+        val2 = w83792d_read_value(client, W83792D_REG_CHIPMAN);
+        if (val1 != 0x7a || val2 != 0x5c)
+                return -ENODEV;
 
         strlcpy(info->type, "w83792d", I2C_NAME_SIZE);