Changeset 5120

Timestamp:

02/08/08 20:10:35 (5 years ago)

Author:

khali

Message:

lm90: Use generic i2c reads during detection (2.6 backport).

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• kernel/chips/lm90.c (modified) (1 diff)

lm-sensors/trunk/CHANGES

@@ -14 +14 @@
   Module gl518sm: Fix fan speed reading (2.6 backport)
   Module gl520sm: Fix fan speed reading (2.6 backport)
+  Module lm90: Use generic i2c reads during detection (2.6 backport)
   Program decode-dimms.pl: Fix DDR2 SDRAM module speed decoding
                            Update manufacturer IDs.

lm-sensors/trunk/kernel/chips/lm90.c

@@ -396 +396 @@
 
         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 (man_id == 0x01) { /* National Semiconductor */
-                        u8 reg_config2;
-
-                        if (lm90_read_reg(new_client, LM90_REG_R_CONFIG2,
-                                          &reg_config2) < 0)
+                        int reg_config2;
+
+                        if ((reg_config2 = i2c_smbus_read_byte_data(new_client,
+                                                LM90_REG_R_CONFIG2)) < 0)
                                 goto exit_free;