hwmon: (lm90) Use generic i2c reads during detection

[Linux Kernel Mailing List]

Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e0ae87a49cf3e721313bf8942299f3f140c6963c
Commit:     e0ae87a49cf3e721313bf8942299f3f140c6963c
Parent:     72240307e988627df46553846936aa89a0f6a283
Author:     Jean Delvare <[EMAIL PROTECTED]>
AuthorDate: Sun Nov 25 21:58:21 2007 +0100
Committer:  Mark M. Hoffman <[EMAIL PROTECTED]>
CommitDate: Thu Feb 7 20:39:41 2008 -0500

    hwmon: (lm90) Use generic i2c reads during detection
    
    As indirectly reported by Olof Johansson, the lm90 driver uses a
    custom i2c read function even during detection, at which point we
    don't know yet what device we're talking with. It would make more
    sense to only use the generic i2c read function at this point, so
    that we don't log irrelevant errors on misdetection.
    
    Signed-off-by: Jean Delvare <[EMAIL PROTECTED]>
    Signed-off-by: Mark M. Hoffman <[EMAIL PROTECTED]>
---
 drivers/hwmon/lm90.c |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
index 960df9f..116093d 100644
--- a/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@ -531,24 +531,24 @@ static int lm90_detect(struct i2c_adapter *adapter, int 
address, int kind)
                kind = lm90;
 
        if (kind < 0) { /* detection and identification */
-               u8 man_id, chip_id, reg_config1, reg_convrate;
-
-               if (lm90_read_reg(new_client, LM90_REG_R_MAN_ID,
-                                 &man_id) < 0
-                || lm90_read_reg(new_client, LM90_REG_R_CHIP_ID,
-                                 &chip_id) < 0
-                || lm90_read_reg(new_client, LM90_REG_R_CONFIG1,
-                                 &reg_config1) < 0
-                || lm90_read_reg(new_client, LM90_REG_R_CONVRATE,
-                                 &reg_convrate) < 0)
+               int man_id, chip_id, reg_config1, reg_convrate;
+
+               if ((man_id = i2c_smbus_read_byte_data(new_client,
+                                               LM90_REG_R_MAN_ID)) < 0
+                || (chip_id = i2c_smbus_read_byte_data(new_client,
+                                               LM90_REG_R_CHIP_ID)) < 0
+                || (reg_config1 = i2c_smbus_read_byte_data(new_client,
+                                               LM90_REG_R_CONFIG1)) < 0
+                || (reg_convrate = i2c_smbus_read_byte_data(new_client,
+                                               LM90_REG_R_CONVRATE)) < 0)
                        goto exit_free;
                
                if ((address == 0x4C || address == 0x4D)
                 && man_id == 0x01) { /* National Semiconductor */
-                       u8 reg_config2;
+                       int reg_config2;
 
-                       if (lm90_read_reg(new_client, LM90_REG_R_CONFIG2,
-                                         &reg_config2) < 0)
+                       if ((reg_config2 = i2c_smbus_read_byte_data(new_client,
+                                               LM90_REG_R_CONFIG2)) < 0)
                                goto exit_free;
 
                        if ((reg_config1 & 0x2A) == 0x00
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html