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 V4 04/14] regulator: da9210: use devm_regulator_register()
Date: Mon, 30 Sep 2013 09:53:57 +0900	[thread overview]
Message-ID: <007701cebd77$8b139f80$a13ade80$%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/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 f7ccff1..6f5ecbe 100644
--- a/drivers/regulator/da9210-regulator.c
+++ b/drivers/regulator/da9210-regulator.c
@@ -155,7 +155,7 @@ static int da9210_i2c_probe(struct i2c_client *i2c,
 	config.regmap = chip->regmap;
 	config.of_node = dev->of_node;
 
-	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);
@@ -168,13 +168,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},
 	{},
@@ -188,7 +181,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-30  0:54 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 ` [PATCH V4 02/14] regulator: ab8500-ext: " Jingoo Han
2013-09-30  0:53 ` [PATCH V4 03/14] regulator: da9063: " Jingoo Han
2013-09-30  0:53 ` Jingoo Han [this message]
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='007701cebd77$8b139f80$a13ade80$%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