[PATCH] max17042_battery: fix driver exit function

[PATCH] max17042_battery: fix driver exit function

[Ramakrishna Pallala]

This patch frees the irq and sets the i2c client
data to NULL in driver remove function.

Signed-off-by: Ramakrishna Pallala <ramakrishna.pallala@intel.com>
---
 drivers/power/max17042_battery.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/power/max17042_battery.c b/drivers/power/max17042_battery.c
index abf3400..d4868c5 100644
--- a/drivers/power/max17042_battery.c
+++ b/drivers/power/max17042_battery.c
@@ -721,6 +721,10 @@ static int __devexit max17042_remove(struct i2c_client *client)
 	struct max17042_chip *chip = i2c_get_clientdata(client);
 
 	power_supply_unregister(&chip->battery);
+	if (client->irq)
+		free_irq(client->irq, chip);
+	i2c_set_clientdata(client, NULL);
+
 	return 0;
 }
 
-- 
1.7.0.4

RE: [PATCH] max17042_battery: fix driver exit function

[Pallala, Ramakrishna]

Hi Anton,

> From: Pallala, Ramakrishna
> Sent: Monday, March 26, 2012 3:38 PM
> To: linux-kernel@vger.kernel.org
> Cc: Anton Vorontsov; Anton Vorontsov; Pallala, Ramakrishna
> Subject: [PATCH] max17042_battery: fix driver exit function
> 
> This patch frees the irq and sets the i2c client data to NULL in driver remove function.
> 
> Signed-off-by: Ramakrishna Pallala <ramakrishna.pallala@intel.com>
> ---
>  drivers/power/max17042_battery.c |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/power/max17042_battery.c b/drivers/power/max17042_battery.c
> index abf3400..d4868c5 100644
> --- a/drivers/power/max17042_battery.c
> +++ b/drivers/power/max17042_battery.c
> @@ -721,6 +721,10 @@ static int __devexit max17042_remove(struct i2c_client *client)
>  	struct max17042_chip *chip = i2c_get_clientdata(client);
> 
>  	power_supply_unregister(&chip->battery);
> +	if (client->irq)
> +		free_irq(client->irq, chip);
> +	i2c_set_clientdata(client, NULL);
> +
>  	return 0;
>  }

I have not received any comments for this patch.
Can I assume that this patch is in your merge queue?

Thanks,
Ram

Re: [PATCH] max17042_battery: fix driver exit function

[Anton Vorontsov]

Hello Ramakrishna,

On Tue, Apr 10, 2012 at 05:20:33AM +0000, Pallala, Ramakrishna wrote:
[...]
> >  	power_supply_unregister(&chip->battery);
> > +	if (client->irq)
> > +		free_irq(client->irq, chip);
> > +	i2c_set_clientdata(client, NULL);
> > +
> >  	return 0;
> >  }
> 
> I have not received any comments for this patch.
> Can I assume that this patch is in your merge queue?

Applied, but I removed i2c_set_clientdata(client, NULL) line in this
patch. It is not be required nowadays, I2C core does it by itself.

Plus, I changed the order of the calls: we should free irq first, then
unregister the power supply (btw, you might want to fix probe function
as well: it should request irq only after power supply object is
fully usable).

Thanks!

-- 
Anton Vorontsov
Email: cbouatmailru@gmail.com

RE: [PATCH] max17042_battery: fix driver exit function

[Pallala, Ramakrishna]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 981 bytes --]

> On Tue, Apr 10, 2012 at 05:20:33AM +0000, Pallala, Ramakrishna wrote:
> [...]
> > >  	power_supply_unregister(&chip->battery);
> > > +	if (client->irq)
> > > +		free_irq(client->irq, chip);
> > > +	i2c_set_clientdata(client, NULL);
> > > +
> > >  	return 0;
> > >  }
> >
> > I have not received any comments for this patch.
> > Can I assume that this patch is in your merge queue?
> 
> Applied, but I removed i2c_set_clientdata(client, NULL) line in this patch. It is not be
> required nowadays, I2C core does it by itself.
> 
> Plus, I changed the order of the calls: we should free irq first, then unregister the
> power supply (btw, you might want to fix probe function as well: it should request irq
> only after power supply object is fully usable).

Thanks for the fix. I will look into the probe().

Thanks,
Ram
ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥