Re: [PATCH v3] ds2782_battery: add support for ds2786 battery gasgauge

From: Anton Vorontsov
Date: Mon Apr 26 2010 - 14:22:12 EST


On Mon, Apr 26, 2010 at 02:05:25PM +0300, Mike Rapoport wrote:
> From: Yulia Vilensky <vilensky@xxxxxxxxxxxxxx>
>
> v2 changes:
> * add ds278x_platform_data
> * address Anton comments
> v3 changes:
> * use ds278x_get_temp for both ds2782 and ds2786
> * update math as per Ryan comments
>
> Signed-off-by: Yulia Vilensky <vilensky@xxxxxxxxxxxxxx>
> Signed-off-by: Mike Rapoport <mike@xxxxxxxxxxxxxx>

Thanks, applied to battery-2.6 with the following change
(we shouldn't compare pointers and integers):

diff --git a/drivers/power/ds2782_battery.c b/drivers/power/ds2782_battery.c
index 6b3cee0..c665e80 100644
--- a/drivers/power/ds2782_battery.c
+++ b/drivers/power/ds2782_battery.c
@@ -325,7 +325,7 @@ static int ds278x_battery_probe(struct i2c_client *client,
* ds2786 should have the sense resistor value set
* in the platform data
*/
- if (id->driver_data == 1 && pdata == 0) {
+ if (id->driver_data == 1 && !pdata) {
dev_err(&client->dev, "missing platform data for ds2786\n");
return -EINVAL;
}

----

Btw, I don't quite like the 'if (id->driver_data == 1)' stuff.
How about the following patch on top?