mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jingoo Han <jg1.han@samsung.com>
To: "'Anton Vorontsov'" <anton@enomsg.org>
Cc: "'David Woodhouse'" <dwmw2@infradead.org>,
	linux-kernel@vger.kernel.org,
	"'Jingoo Han'" <jg1.han@samsung.com>
Subject: [PATCH 09/14] power: max8903_charger: use devm_kzalloc()
Date: Mon, 11 Mar 2013 15:34:35 +0900	[thread overview]
Message-ID: <007901ce1e22$7f6ffc90$7e4ff5b0$%han@samsung.com> (raw)
In-Reply-To: <007101ce1e21$f39efcc0$dadcf640$%han@samsung.com>

Use devm_kzalloc() to make cleanup paths more simple.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/power/max8903_charger.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/drivers/power/max8903_charger.c b/drivers/power/max8903_charger.c
index 14e2b96..08f0d79 100644
--- a/drivers/power/max8903_charger.c
+++ b/drivers/power/max8903_charger.c
@@ -189,7 +189,7 @@ static int max8903_probe(struct platform_device *pdev)
 	int ta_in = 0;
 	int usb_in = 0;
 
-	data = kzalloc(sizeof(struct max8903_data), GFP_KERNEL);
+	data = devm_kzalloc(dev, sizeof(struct max8903_data), GFP_KERNEL);
 	if (data == NULL) {
 		dev_err(dev, "Cannot allocate memory.\n");
 		return -ENOMEM;
@@ -341,7 +341,6 @@ err_dc_irq:
 err_psy:
 	power_supply_unregister(&data->psy);
 err:
-	kfree(data);
 	return ret;
 }
 
@@ -359,7 +358,6 @@ static int max8903_remove(struct platform_device *pdev)
 		if (pdata->dc_valid)
 			free_irq(gpio_to_irq(pdata->dok), data);
 		power_supply_unregister(&data->psy);
-		kfree(data);
 	}
 
 	return 0;
-- 
1.7.2.5



  parent reply	other threads:[~2013-03-11  6:34 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-11  6:30 [PATCH 01/14] power: 88pm860x_charger: drop kfree of devm_kzalloc'd data Jingoo Han
2013-03-11  6:31 ` [PATCH 02/14] power: max8925_power: use devm_kzalloc() Jingoo Han
2013-03-11  6:31 ` [PATCH 03/14] power: da9030_battery: " Jingoo Han
2013-03-11  6:32 ` [PATCH 04/14] power: da9052-battery: " Jingoo Han
2013-03-11  6:32 ` [PATCH 05/14] power: ds2760_battery: " Jingoo Han
2013-03-11  6:33 ` [PATCH 06/14] power: ds2780_battery: " Jingoo Han
2013-03-11  6:33 ` [PATCH 07/14] power: gpio-charger: " Jingoo Han
2013-03-11  6:34 ` [PATCH 08/14] power: isp1704_charger: " Jingoo Han
2013-03-11  6:34 ` Jingoo Han [this message]
2013-03-11  6:34 ` [PATCH 10/14] power: max8997_charger: " Jingoo Han
2013-03-11  6:35 ` [PATCH 11/14] power: max8998_charger: " Jingoo Han
2013-03-11  6:35 ` [PATCH 12/14] power: pcf50633-charger: " Jingoo Han
2013-03-11  6:35 ` [PATCH 13/14] power: rx51_battery: " Jingoo Han
2013-03-11  6:36 ` [PATCH 14/14] power: wm831x_backup: " Jingoo Han
2013-04-01  6:29 ` [PATCH 01/14] power: 88pm860x_charger: drop kfree of devm_kzalloc'd data Anton Vorontsov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='007901ce1e22$7f6ffc90$7e4ff5b0$%han@samsung.com' \
    --to=jg1.han@samsung.com \
    --cc=anton@enomsg.org \
    --cc=dwmw2@infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome