From a4a8b5affeefdf19ec47d4795d41330d326b66cb Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Sun, 25 Nov 2007 21:58:21 +0100
Subject: [PATCH] --- yaml --- r: 84511 b: refs/heads/master c:
 e0ae87a49cf3e721313bf8942299f3f140c6963c h: refs/heads/master i:   84509:
 a16023ccc077f1177443e1f6fb5360797d68943a   84507:
 52baec29d8a698c5a57636a54fe6a0a89c4ef511   84503:
 a5de1fd4d2082e1fbca078585c5ad265a719c2a2   84495:
 31575a326cae159ea984c0c36b5cf8b4d2c28f4d   84479:
 e30caf16271c4c0cce33cdb1335ce842cf1ef318 v: v3

---
 [refs]                     |  2 +-
 trunk/drivers/hwmon/lm90.c | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 3c71776c0bf9..188ab3e68ae5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72240307e988627df46553846936aa89a0f6a283
+refs/heads/master: e0ae87a49cf3e721313bf8942299f3f140c6963c
diff --git a/trunk/drivers/hwmon/lm90.c b/trunk/drivers/hwmon/lm90.c
index 960df9fa75af..116093d0eb3e 100644
--- a/trunk/drivers/hwmon/lm90.c
+++ b/trunk/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