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, 26 insertions, 30 deletions

diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c
index 55bd87c15c9a..e392548cccb8 100644
--- a/drivers/hwmon/lm75.c
+++ b/drivers/hwmon/lm75.c
@@ -239,6 +239,7 @@ static int lm75_detect(struct i2c_client *new_client, int kind,
 {
         struct i2c_adapter *adapter = new_client->adapter;
         int i;
+        int cur, conf, hyst, os;
 
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA |
                                      I2C_FUNC_SMBUS_WORD_DATA))
@@ -251,40 +252,35 @@ static int lm75_detect(struct i2c_client *new_client, int kind,
            The cycling+unused addresses combination is not tested,
            since it would significantly slow the detection down and would
            hardly add any value. */
-        if (kind < 0) {
-                int cur, conf, hyst, os;
-
-                /* Unused addresses */
-                cur = i2c_smbus_read_word_data(new_client, 0);
-                conf = i2c_smbus_read_byte_data(new_client, 1);
-                hyst = i2c_smbus_read_word_data(new_client, 2);
-                if (i2c_smbus_read_word_data(new_client, 4) != hyst
-                 || i2c_smbus_read_word_data(new_client, 5) != hyst
-                 || i2c_smbus_read_word_data(new_client, 6) != hyst
-                 || i2c_smbus_read_word_data(new_client, 7) != hyst)
-                        return -ENODEV;
-                os = i2c_smbus_read_word_data(new_client, 3);
-                if (i2c_smbus_read_word_data(new_client, 4) != os
-                 || i2c_smbus_read_word_data(new_client, 5) != os
-                 || i2c_smbus_read_word_data(new_client, 6) != os
-                 || i2c_smbus_read_word_data(new_client, 7) != os)
-                        return -ENODEV;
 
-                /* Unused bits */
-                if (conf & 0xe0)
-                        return -ENODEV;
+        /* Unused addresses */
+        cur = i2c_smbus_read_word_data(new_client, 0);
+        conf = i2c_smbus_read_byte_data(new_client, 1);
+        hyst = i2c_smbus_read_word_data(new_client, 2);
+        if (i2c_smbus_read_word_data(new_client, 4) != hyst
+         || i2c_smbus_read_word_data(new_client, 5) != hyst
+         || i2c_smbus_read_word_data(new_client, 6) != hyst
+         || i2c_smbus_read_word_data(new_client, 7) != hyst)
+                return -ENODEV;
+        os = i2c_smbus_read_word_data(new_client, 3);
+        if (i2c_smbus_read_word_data(new_client, 4) != os
+         || i2c_smbus_read_word_data(new_client, 5) != os
+         || i2c_smbus_read_word_data(new_client, 6) != os
+         || i2c_smbus_read_word_data(new_client, 7) != os)
+                return -ENODEV;
 
-                /* Addresses cycling */
-                for (i = 8; i < 0xff; i += 8)
-                        if (i2c_smbus_read_byte_data(new_client, i + 1) != conf
-                         || i2c_smbus_read_word_data(new_client, i + 2) != hyst
-                         || i2c_smbus_read_word_data(new_client, i + 3) != os)
-                                return -ENODEV;
+        /* Unused bits */
+        if (conf & 0xe0)
+                return -ENODEV;
+
+        /* Addresses cycling */
+        for (i = 8; i < 0xff; i += 8) {
+                if (i2c_smbus_read_byte_data(new_client, i + 1) != conf
+                 || i2c_smbus_read_word_data(new_client, i + 2) != hyst
+                 || i2c_smbus_read_word_data(new_client, i + 3) != os)
+                        return -ENODEV;
         }
 
-        /* NOTE: we treat "force=..." and "force_lm75=..." the same.
-         * Only new-style driver binding distinguishes chip types.
-         */
         strlcpy(info->type, "lm75", I2C_NAME_SIZE);
 
         return 0;