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>,
"'Axel Lin'" <axel.lin@ingics.com>
Subject: [PATCH 18/20] regulator: tps6524x: use devm_regulator_register()
Date: Wed, 25 Sep 2013 17:13:04 +0900 [thread overview]
Message-ID: <001b01ceb9c7$0f759e40$2e60dac0$%han@samsung.com> (raw)
In-Reply-To: <000901ceb9c3$97fe74c0$c7fb5e40$%han@samsung.com>
Use devm_regulator_register() to make cleanup paths simpler.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/regulator/tps6524x-regulator.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/regulator/tps6524x-regulator.c b/drivers/regulator/tps6524x-regulator.c
index 8b9ee39..8fe67fb 100644
--- a/drivers/regulator/tps6524x-regulator.c
+++ b/drivers/regulator/tps6524x-regulator.c
@@ -584,10 +584,8 @@ static int pmic_remove(struct spi_device *spi)
if (!hw)
return 0;
- for (i = 0; i < N_REGULATORS; i++) {
- regulator_unregister(hw->rdev[i]);
+ for (i = 0; i < N_REGULATORS; i++)
hw->rdev[i] = NULL;
- }
return 0;
}
@@ -631,7 +629,8 @@ static int pmic_probe(struct spi_device *spi)
config.init_data = init_data;
config.driver_data = hw;
- hw->rdev[i] = regulator_register(&hw->desc[i], &config);
+ hw->rdev[i] = devm_regulator_register(dev, &hw->desc[i],
+ &config);
if (IS_ERR(hw->rdev[i])) {
ret = PTR_ERR(hw->rdev[i]);
hw->rdev[i] = NULL;
--
1.7.10.4
next prev parent reply other threads:[~2013-09-25 8:13 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-25 7:48 [PATCH 01/20] regulator: ab3100: " Jingoo Han
2013-09-25 7:51 ` [PATCH 02/20] regulator: ab8500: " Jingoo Han
2013-09-25 10:20 ` Sachin Kamat
2013-09-26 1:25 ` Jingoo Han
2013-09-25 7:52 ` [PATCH 03/20] regulator: ab8500-ext: " Jingoo Han
2013-09-25 7:55 ` [PATCH 04/20] regulator: da9063: " Jingoo Han
2013-09-25 7:56 ` [PATCH 05/20] regulator: da9210: " Jingoo Han
2013-09-25 7:58 ` [PATCH 06/20] regulator: fixed: " Jingoo Han
2013-09-25 8:00 ` [PATCH 07/20] regulator: gpio-regulator: " Jingoo Han
2013-09-25 8:01 ` [PATCH 08/20] regulator: lp3971: " Jingoo Han
2013-09-25 8:02 ` [PATCH 09/20] regulator: lp3972: " Jingoo Han
2013-09-25 10:17 ` Sachin Kamat
2013-09-26 1:17 ` Jingoo Han
2013-09-25 8:03 ` [PATCH 10/20] regulator: lp872x: " Jingoo Han
2013-09-25 8:04 ` [PATCH 11/20] regulator: lp8788-buck: " Jingoo Han
2013-09-25 8:05 ` [PATCH 12/20] regulator: lp8788-ldo: " Jingoo Han
2013-09-25 8:06 ` [PATCH 13/20] regulator: max8925: " Jingoo Han
2013-09-25 8:08 ` [PATCH 14/20] regulator: max8952: " Jingoo Han
2013-09-25 8:09 ` [PATCH 15/20] regulator: pcap: " Jingoo Han
2013-09-25 8:11 ` [PATCH 16/20] regulator: pcf50633: " Jingoo Han
2013-09-25 8:12 ` [PATCH 17/20] regulator: tps6105x: " Jingoo Han
2013-09-27 12:42 ` Linus Walleij
2013-09-25 8:13 ` Jingoo Han [this message]
2013-09-25 8:15 ` [PATCH 19/20] regulator: twl: " Jingoo Han
2013-09-25 12:59 ` Nishanth Menon
2013-09-25 8:17 ` [PATCH 20/20] regulator: vexpress: " Jingoo Han
2013-09-25 10:56 ` Pawel Moll
2013-09-27 12:41 ` [PATCH 01/20] regulator: ab3100: " Linus Walleij
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='001b01ceb9c7$0f759e40$2e60dac0$%han@samsung.com' \
--to=jg1.han@samsung.com \
--cc=axel.lin@ingics.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
all inboxes | Powered by JetHome®