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>,
"'Linus Walleij'" <linus.walleij@linaro.org>
Subject: [PATCH V3 11/14] regulator: tps6105x: use devm_regulator_register()
Date: Thu, 26 Sep 2013 16:52:46 +0900 [thread overview]
Message-ID: <003b01ceba8d$63c9aec0$2b5d0c40$%han@samsung.com> (raw)
In-Reply-To: <003101ceba8c$88d6a840$9a83f8c0$%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/tps6105x-regulator.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/drivers/regulator/tps6105x-regulator.c b/drivers/regulator/tps6105x-regulator.c
index ec9453f..e0e818d 100644
--- a/drivers/regulator/tps6105x-regulator.c
+++ b/drivers/regulator/tps6105x-regulator.c
@@ -146,8 +146,9 @@ static int tps6105x_regulator_probe(struct platform_device *pdev)
config.driver_data = tps6105x;
/* Register regulator with framework */
- tps6105x->regulator = regulator_register(&tps6105x_regulator_desc,
- &config);
+ tps6105x->regulator = devm_regulator_register(&pdev->dev,
+ &tps6105x_regulator_desc,
+ &config);
if (IS_ERR(tps6105x->regulator)) {
ret = PTR_ERR(tps6105x->regulator);
dev_err(&tps6105x->client->dev,
@@ -159,20 +160,12 @@ static int tps6105x_regulator_probe(struct platform_device *pdev)
return 0;
}
-static int tps6105x_regulator_remove(struct platform_device *pdev)
-{
- struct tps6105x *tps6105x = dev_get_platdata(&pdev->dev);
- regulator_unregister(tps6105x->regulator);
- return 0;
-}
-
static struct platform_driver tps6105x_regulator_driver = {
.driver = {
.name = "tps6105x-regulator",
.owner = THIS_MODULE,
},
.probe = tps6105x_regulator_probe,
- .remove = tps6105x_regulator_remove,
};
static __init int tps6105x_regulator_init(void)
--
1.7.10.4
next prev parent reply other threads:[~2013-09-26 7:52 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-26 7:46 [PATCH V3 01/14] regulator: ab3100: use devm_regulator_register() Jingoo Han
2013-09-26 7:47 ` [PATCH V3 02/14] regulator: ab8500-ext: " Jingoo Han
2013-09-26 7:48 ` [PATCH V3 03/14] regulator: da9063: " Jingoo Han
2013-09-26 7:48 ` [PATCH V3 04/14] regulator: da9210: " Jingoo Han
2013-09-26 7:49 ` [PATCH V3 05/14] regulator: lp872x: " Jingoo Han
2013-09-26 7:50 ` [PATCH V3 06/14] regulator: lp8788-buck: " Jingoo Han
2013-09-26 7:50 ` From 782c15faac0a93cdac43b212073081707f669272 Mon Sep 17 00:00:00 2001 Jingoo Han
2013-09-26 7:55 ` Sachin Kamat
2013-09-26 8:00 ` Jingoo Han
2013-09-26 7:51 ` [PATCH V3 08/14] regulator: max8925: use devm_regulator_register() Jingoo Han
2013-09-26 7:51 ` [PATCH V3 09/14] regulator: pcap: " Jingoo Han
2013-09-26 7:52 ` [PATCH V3 10/14] regulator: pcf50633: " Jingoo Han
2013-09-26 7:52 ` Jingoo Han [this message]
2013-09-26 7:53 ` [PATCH V3 12/14] regulator: tps6524x: " Jingoo Han
2013-09-26 8:06 ` Axel Lin
2013-09-26 8:13 ` Jingoo Han
2013-09-26 8:22 ` Axel Lin
2013-09-30 0:46 ` Jingoo Han
2013-09-26 7:53 ` [PATCH V3 13/14] regulator: twl: " Jingoo Han
2013-09-26 7:54 ` [PATCH V3 14/14] regulator: vexpress: " Jingoo Han
2013-09-26 7:57 ` [PATCH V3 07/14] regulator: lp8788-ldo: " Jingoo Han
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='003b01ceba8d$63c9aec0$2b5d0c40$%han@samsung.com' \
--to=jg1.han@samsung.com \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linus.walleij@linaro.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