linux-pm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] power: max17040: use devm_kzalloc
@ 2013-01-06  4:53 Devendra Naga
  2013-01-06 22:21 ` Anton Vorontsov
  0 siblings, 1 reply; 2+ messages in thread
From: Devendra Naga @ 2013-01-06  4:53 UTC (permalink / raw)
  To: Anton Vorontsov, David Woodhouse, linux-pm; +Cc: Devendra Naga

use devm_kzalloc and no need of error path and unload frees

Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
---
 drivers/power/max17040_battery.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/power/max17040_battery.c b/drivers/power/max17040_battery.c
index 22cfe9c..74a0bd9 100644
--- a/drivers/power/max17040_battery.c
+++ b/drivers/power/max17040_battery.c
@@ -207,7 +207,7 @@ static int max17040_probe(struct i2c_client *client,
 	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE))
 		return -EIO;
 
-	chip = kzalloc(sizeof(*chip), GFP_KERNEL);
+	chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
 	if (!chip)
 		return -ENOMEM;
 
@@ -225,7 +225,6 @@ static int max17040_probe(struct i2c_client *client,
 	ret = power_supply_register(&client->dev, &chip->battery);
 	if (ret) {
 		dev_err(&client->dev, "failed: power supply register\n");
-		kfree(chip);
 		return ret;
 	}
 
@@ -244,7 +243,6 @@ static int max17040_remove(struct i2c_client *client)
 
 	power_supply_unregister(&chip->battery);
 	cancel_delayed_work(&chip->work);
-	kfree(chip);
 	return 0;
 }
 
-- 
1.7.10.4


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] power: max17040: use devm_kzalloc
  2013-01-06  4:53 [PATCH] power: max17040: use devm_kzalloc Devendra Naga
@ 2013-01-06 22:21 ` Anton Vorontsov
  0 siblings, 0 replies; 2+ messages in thread
From: Anton Vorontsov @ 2013-01-06 22:21 UTC (permalink / raw)
  To: Devendra Naga; +Cc: David Woodhouse, linux-pm

On Sat, Jan 05, 2013 at 11:53:25PM -0500, Devendra Naga wrote:
> use devm_kzalloc and no need of error path and unload frees
> 
> Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
> ---

Applied, thanks.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-01-06 22:25 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-06  4:53 [PATCH] power: max17040: use devm_kzalloc Devendra Naga
2013-01-06 22:21 ` Anton Vorontsov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).