* [lm-sensors] [PATCH] hwmon: (lm90) Use generic i2c reads during
@ 2007-10-24 22:05 Jean Delvare
2007-11-25 1:53 ` Mark M. Hoffman
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Jean Delvare @ 2007-10-24 22:05 UTC (permalink / raw)
To: lm-sensors
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>
---
drivers/hwmon/lm90.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
--- linux-2.6.24-rc1.orig/drivers/hwmon/lm90.c 2007-10-24 09:59:28.000000000 +0200
+++ linux-2.6.24-rc1/drivers/hwmon/lm90.c 2007-10-24 23:56:32.000000000 +0200
@@ -531,24 +531,24 @@ static int lm90_detect(struct i2c_adapte
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
--
Jean Delvare
_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [lm-sensors] [PATCH] hwmon: (lm90) Use generic i2c reads during
2007-10-24 22:05 [lm-sensors] [PATCH] hwmon: (lm90) Use generic i2c reads during Jean Delvare
@ 2007-11-25 1:53 ` Mark M. Hoffman
2007-11-25 20:58 ` Jean Delvare
2007-11-25 21:28 ` Mark M. Hoffman
2 siblings, 0 replies; 4+ messages in thread
From: Mark M. Hoffman @ 2007-11-25 1:53 UTC (permalink / raw)
To: lm-sensors
Hi Jean:
* Jean Delvare <khali@linux-fr.org> [2007-10-25 00:05:43 +0200]:
> 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>
> ---
> drivers/hwmon/lm90.c | 24 ++++++++++++------------
> 1 file changed, 12 insertions(+), 12 deletions(-)
Applied to hwmon-2.6.git/testing, thanks.
--
Mark M. Hoffman
mhoffman@lightlink.com
_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [lm-sensors] [PATCH] hwmon: (lm90) Use generic i2c reads during
2007-10-24 22:05 [lm-sensors] [PATCH] hwmon: (lm90) Use generic i2c reads during Jean Delvare
2007-11-25 1:53 ` Mark M. Hoffman
@ 2007-11-25 20:58 ` Jean Delvare
2007-11-25 21:28 ` Mark M. Hoffman
2 siblings, 0 replies; 4+ messages in thread
From: Jean Delvare @ 2007-11-25 20:58 UTC (permalink / raw)
To: lm-sensors
Oops, my patch was actually broken (misplaced parentheses). Here's an
update, sorry.
* * * * *
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>
---
drivers/hwmon/lm90.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
--- linux-2.6.24-rc3.orig/drivers/hwmon/lm90.c 2007-11-25 11:18:35.000000000 +0100
+++ linux-2.6.24-rc3/drivers/hwmon/lm90.c 2007-11-25 21:37:58.000000000 +0100
@@ -531,24 +531,24 @@ static int lm90_detect(struct i2c_adapte
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
--
Jean Delvare
_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [lm-sensors] [PATCH] hwmon: (lm90) Use generic i2c reads during
2007-10-24 22:05 [lm-sensors] [PATCH] hwmon: (lm90) Use generic i2c reads during Jean Delvare
2007-11-25 1:53 ` Mark M. Hoffman
2007-11-25 20:58 ` Jean Delvare
@ 2007-11-25 21:28 ` Mark M. Hoffman
2 siblings, 0 replies; 4+ messages in thread
From: Mark M. Hoffman @ 2007-11-25 21:28 UTC (permalink / raw)
To: lm-sensors
Hi Jean:
* Jean Delvare <khali@linux-fr.org> [2007-11-25 21:58:21 +0100]:
> Oops, my patch was actually broken (misplaced parentheses). Here's an
> update, sorry.
>
> * * * * *
>
> 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>
> ---
> drivers/hwmon/lm90.c | 24 ++++++++++++------------
> 1 file changed, 12 insertions(+), 12 deletions(-)
Yep, I missed that too. I've inserted this patch into hwmon-2.6.git/testing
in place of the previous one, thanks.
--
Mark M. Hoffman
mhoffman@lightlink.com
_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2007-11-25 21:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-10-24 22:05 [lm-sensors] [PATCH] hwmon: (lm90) Use generic i2c reads during Jean Delvare
2007-11-25 1:53 ` Mark M. Hoffman
2007-11-25 20:58 ` Jean Delvare
2007-11-25 21:28 ` Mark M. Hoffman
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.