public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Jingoo Han <jg1.han@samsung.com>
To: "'Mark Brown'" <broonie@kernel.org>
Cc: "'Liam Girdwood'" <lgirdwood@gmail.com>,
	linux-kernel@vger.kernel.org,
	"'Jingoo Han'" <jg1.han@samsung.com>,
	"'Bengt Jonsson'" <bengt.g.jonsson@stericsson.com>
Subject: [PATCH V4 02/14] regulator: ab8500-ext: use devm_regulator_register()
Date: Mon, 30 Sep 2013 09:52:37 +0900	[thread overview]
Message-ID: <007501cebd77$5b4e2950$11ea7bf0$%han@samsung.com> (raw)
In-Reply-To: <007401cebd77$0652a340$12f7e9c0$%han@samsung.com>

Use devm_regulator_register() to make cleanup paths simpler,
and remove unnecessary remove().

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/regulator/ab8500-ext.c |   26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/drivers/regulator/ab8500-ext.c b/drivers/regulator/ab8500-ext.c
index 02ff691..29c0faa 100644
--- a/drivers/regulator/ab8500-ext.c
+++ b/drivers/regulator/ab8500-ext.c
@@ -413,16 +413,12 @@ static int ab8500_ext_regulator_probe(struct platform_device *pdev)
 			&pdata->ext_regulator[i];
 
 		/* register regulator with framework */
-		info->rdev = regulator_register(&info->desc, &config);
+		info->rdev = devm_regulator_register(&pdev->dev, &info->desc,
+						     &config);
 		if (IS_ERR(info->rdev)) {
 			err = PTR_ERR(info->rdev);
 			dev_err(&pdev->dev, "failed to register regulator %s\n",
 					info->desc.name);
-			/* when we fail, un-register all earlier regulators */
-			while (--i >= 0) {
-				info = &ab8500_ext_regulator_info[i];
-				regulator_unregister(info->rdev);
-			}
 			return err;
 		}
 
@@ -433,26 +429,8 @@ static int ab8500_ext_regulator_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static int ab8500_ext_regulator_remove(struct platform_device *pdev)
-{
-	int i;
-
-	for (i = 0; i < ARRAY_SIZE(ab8500_ext_regulator_info); i++) {
-		struct ab8500_ext_regulator_info *info = NULL;
-		info = &ab8500_ext_regulator_info[i];
-
-		dev_vdbg(rdev_get_dev(info->rdev),
-			"%s-remove\n", info->desc.name);
-
-		regulator_unregister(info->rdev);
-	}
-
-	return 0;
-}
-
 static struct platform_driver ab8500_ext_regulator_driver = {
 	.probe = ab8500_ext_regulator_probe,
-	.remove = ab8500_ext_regulator_remove,
 	.driver         = {
 		.name   = "ab8500-ext-regulator",
 		.owner  = THIS_MODULE,
-- 
1.7.10.4



  reply	other threads:[~2013-09-30  0:52 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-30  0:50 [PATCH V4 01/14] regulator: ab3100: use devm_regulator_register() Jingoo Han
2013-09-30  0:52 ` Jingoo Han [this message]
2013-09-30  0:53 ` [PATCH V4 03/14] regulator: da9063: " Jingoo Han
2013-09-30  0:53 ` [PATCH V4 04/14] regulator: da9210: " Jingoo Han
2013-09-30  0:54 ` [PATCH V4 05/14] regulator: lp872x: " Jingoo Han
2013-09-30  0:55 ` [PATCH V4 06/14] regulator: lp8788-buck: " Jingoo Han
2013-09-30  0:55 ` [PATCH V4 07/14] regulator: lp8788-ldo: " Jingoo Han
2013-09-30  0:56 ` [PATCH V4 08/14] regulator: max8925: " Jingoo Han
2013-09-30  0:56 ` [PATCH V4 09/14] regulator: pcap: " Jingoo Han
2013-09-30  0:57 ` [PATCH V4 10/14] regulator: pcf50633: " Jingoo Han
2013-09-30  0:57 ` [PATCH V4 11/14] regulator: tps6105x: " Jingoo Han
2013-09-30  0:58 ` [PATCH V4 12/14] regulator: tps6524x: " Jingoo Han
2013-09-30  0:59 ` [PATCH V4 13/14] regulator: twl: " Jingoo Han
2013-09-30  0:59 ` [PATCH V4 14/14] regulator: vexpress: " Jingoo Han
2013-09-30 17:12 ` [PATCH V4 01/14] regulator: ab3100: " Mark Brown

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='007501cebd77$5b4e2950$11ea7bf0$%han@samsung.com' \
    --to=jg1.han@samsung.com \
    --cc=bengt.g.jonsson@stericsson.com \
    --cc=broonie@kernel.org \
    --cc=lgirdwood@gmail.com \
    --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