hwmon: Clean up detect functions

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: Corentin Labbe <corentin.labbe@geomatys.fr>
Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>
Cc: Juerg Haefliger <juergh@gmail.com>
Cc: Riku Voipio <riku.voipio@iki.fi>
Acked-by: "Hans J. Koch" <hjk@linutronix.de>
Cc: Rudolf Marek <r.marek@assembler.cz>

1 files changed, 10 insertions, 12 deletions

diff --git a/drivers/hwmon/ads7828.c b/drivers/hwmon/ads7828.c
index 5c39b4af1b23..451977bca7d6 100644
--- a/drivers/hwmon/ads7828.c
+++ b/drivers/hwmon/ads7828.c
@@ -191,6 +191,7 @@ static int ads7828_detect(struct i2c_client *client, int kind,
                           struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
+        int ch;
 
         /* Check we have a valid client */
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_READ_WORD_DATA))
@@ -202,20 +203,17 @@ static int ads7828_detect(struct i2c_client *client, int kind,
         - Read from the 8 channel addresses
         - Check the top 4 bits of each result are not set (12 data bits)
         */
-        if (kind < 0) {
-                int ch;
-                for (ch = 0; ch < ADS7828_NCH; ch++) {
-                        u16 in_data;
-                        u8 cmd = channel_cmd_byte(ch);
-                        in_data = ads7828_read_value(client, cmd);
-                        if (in_data & 0xF000) {
-                                printk(KERN_DEBUG
-                                "%s : Doesn't look like an ads7828 device\n",
-                                __func__);
-                                return -ENODEV;
-                        }
+        for (ch = 0; ch < ADS7828_NCH; ch++) {
+                u16 in_data;
+                u8 cmd = channel_cmd_byte(ch);
+                in_data = ads7828_read_value(client, cmd);
+                if (in_data & 0xF000) {
+                        pr_debug("%s : Doesn't look like an ads7828 device\n",
+                                 __func__);
+                        return -ENODEV;
                 }
         }
+
         strlcpy(info->type, "ads7828", I2C_NAME_SIZE);
 
         return 0;