mirror of https://lore.kernel.org/lkml/
 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>,
	"'Robin Gong'" <b38343@freescale.com>,
	"'Axel Lin'" <axel.lin@ingics.com>,
	"'Tim Harvey'" <tharvey@gateworks.com>
Subject: [PATCH 5/6] regulator: pfuze100: use devm_regulator_register()
Date: Fri, 06 Dec 2013 16:11:58 +0900	[thread overview]
Message-ID: <000e01cef252$7423b3e0$5c6b1ba0$%han@samsung.com> (raw)
In-Reply-To: <000a01cef251$c79ea9e0$56dbfda0$%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/pfuze100-regulator.c |   20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/drivers/regulator/pfuze100-regulator.c b/drivers/regulator/pfuze100-regulator.c
index 032df37..50c1bf8 100644
--- a/drivers/regulator/pfuze100-regulator.c
+++ b/drivers/regulator/pfuze100-regulator.c
@@ -408,31 +408,18 @@ static int pfuze100_regulator_probe(struct i2c_client *client,
 		config.driver_data = pfuze_chip;
 		config.of_node = match_of_node(i);
 
-		pfuze_chip->regulators[i] = regulator_register(desc, &config);
+		pfuze_chip->regulators[i] =
+			devm_regulator_register(&client->dev, desc, &config);
 		if (IS_ERR(pfuze_chip->regulators[i])) {
 			dev_err(&client->dev, "register regulator%s failed\n",
 				pfuze100_regulators[i].desc.name);
-			ret = PTR_ERR(pfuze_chip->regulators[i]);
-			while (--i >= 0)
-				regulator_unregister(pfuze_chip->regulators[i]);
-			return ret;
+			return PTR_ERR(pfuze_chip->regulators[i]);
 		}
 	}
 
 	return 0;
 }
 
-static int pfuze100_regulator_remove(struct i2c_client *client)
-{
-	int i;
-	struct pfuze_chip *pfuze_chip = i2c_get_clientdata(client);
-
-	for (i = 0; i < PFUZE100_MAX_REGULATOR; i++)
-		regulator_unregister(pfuze_chip->regulators[i]);
-
-	return 0;
-}
-
 static struct i2c_driver pfuze_driver = {
 	.id_table = pfuze_device_id,
 	.driver = {
@@ -441,7 +428,6 @@ static struct i2c_driver pfuze_driver = {
 		.of_match_table = pfuze_dt_ids,
 	},
 	.probe = pfuze100_regulator_probe,
-	.remove = pfuze100_regulator_remove,
 };
 module_i2c_driver(pfuze_driver);
 
-- 
1.7.10.4



  parent reply	other threads:[~2013-12-06  7:12 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-06  7:07 [PATCH 1/6] regulator: ab8500: " Jingoo Han
2013-12-06  7:08 ` [PATCH 2/6] regulator: db8500-prcmu: " Jingoo Han
2013-12-06  8:35   ` Bengt Jönsson
2013-12-09 17:41   ` Mark Brown
2013-12-06  7:09 ` [PATCH 3/6] regulator: fixed: " Jingoo Han
2013-12-09 17:44   ` Mark Brown
2013-12-10  6:08     ` Jingoo Han
2013-12-06  7:10 ` [PATCH 4/6] regulator: gpio-regulator: " Jingoo Han
2013-12-06  9:12   ` Heiko Stübner
2013-12-06 12:09     ` Mark Brown
2013-12-09  2:01       ` Jingoo Han
2013-12-06  7:11 ` Jingoo Han [this message]
2013-12-09  2:36   ` [PATCH 5/6] regulator: pfuze100: " yibin.gong
2013-12-09 17:42   ` Mark Brown
2013-12-06  7:12 ` [PATCH 6/6] regulator: stw481x-vmmc: " Jingoo Han
2013-12-09  8:33   ` Linus Walleij
2013-12-09 17:26   ` Mark Brown
2013-12-06  8:26 ` [PATCH 1/6] regulator: ab8500: " Lee Jones
2013-12-09 17:38 ` 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='000e01cef252$7423b3e0$5c6b1ba0$%han@samsung.com' \
    --to=jg1.han@samsung.com \
    --cc=axel.lin@ingics.com \
    --cc=b38343@freescale.com \
    --cc=broonie@kernel.org \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tharvey@gateworks.com \
    /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

all inboxes | Powered by JetHome®