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>,
	"'Steve Twiss'" <stwiss.opensource@diasemi.com>,
	"'David Dajun Chen'" <david.chen@diasemi.com>
Subject: [PATCH 05/20] regulator: da9210: use devm_regulator_register()
Date: Wed, 25 Sep 2013 16:56:31 +0900	[thread overview]
Message-ID: <000e01ceb9c4$bf4d5d10$3de81730$%han@samsung.com> (raw)
In-Reply-To: <000901ceb9c3$97fe74c0$c7fb5e40$%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/da9210-regulator.c |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/drivers/regulator/da9210-regulator.c b/drivers/regulator/da9210-regulator.c
index f0fe54b..82368a3 100644
--- a/drivers/regulator/da9210-regulator.c
+++ b/drivers/regulator/da9210-regulator.c
@@ -152,7 +152,7 @@ static int da9210_i2c_probe(struct i2c_client *i2c,
 	config.driver_data = chip;
 	config.regmap = chip->regmap;
 
-	rdev = regulator_register(&da9210_reg, &config);
+	rdev = devm_regulator_register(&i2c->dev, &da9210_reg, &config);
 	if (IS_ERR(rdev)) {
 		dev_err(&i2c->dev, "Failed to register DA9210 regulator\n");
 		return PTR_ERR(rdev);
@@ -165,13 +165,6 @@ static int da9210_i2c_probe(struct i2c_client *i2c,
 	return 0;
 }
 
-static int da9210_i2c_remove(struct i2c_client *i2c)
-{
-	struct da9210 *chip = i2c_get_clientdata(i2c);
-	regulator_unregister(chip->rdev);
-	return 0;
-}
-
 static const struct i2c_device_id da9210_i2c_id[] = {
 	{"da9210", 0},
 	{},
@@ -185,7 +178,6 @@ static struct i2c_driver da9210_regulator_driver = {
 		.owner = THIS_MODULE,
 	},
 	.probe = da9210_i2c_probe,
-	.remove = da9210_i2c_remove,
 	.id_table = da9210_i2c_id,
 };
 
-- 
1.7.10.4



  parent reply	other threads:[~2013-09-25  7:56 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-25  7:48 [PATCH 01/20] regulator: ab3100: use devm_regulator_register() 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 ` Jingoo Han [this message]
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 ` [PATCH 18/20] regulator: tps6524x: " Jingoo Han
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='000e01ceb9c4$bf4d5d10$3de81730$%han@samsung.com' \
    --to=jg1.han@samsung.com \
    --cc=broonie@kernel.org \
    --cc=david.chen@diasemi.com \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stwiss.opensource@diasemi.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