mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 10:57:46 +00:00
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 <khali@linux-fr.org> Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>
This commit is contained in:
parent
72240307e9
commit
e0ae87a49c
1 changed files with 12 additions and 12 deletions
|
@ -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;
|
||||
int 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,
|
||||
®_config1) < 0
|
||||
|| lm90_read_reg(new_client, LM90_REG_R_CONVRATE,
|
||||
®_convrate) < 0)
|
||||
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,
|
||||
®_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
|
||||
|
|
Loading…
Reference in a new issue