From: Sachin Kamat <sachin.kamat@linaro.org>
To: linux-kernel@vger.kernel.org
Cc: broonie@kernel.org, sachin.kamat@linaro.org,
kyungmin.park@samsung.com, myungjoo.ham@samsung.com,
ldewangan@nvidia.com, jack.yoo@maxim-ic.com,
haojian.zhuang@marvell.com, jonghwa3.lee@samsung.com
Subject: [PATCH 2/9] regulator: max1586: Use devm_regulator_register
Date: Wed, 4 Sep 2013 11:07:55 +0530 [thread overview]
Message-ID: <1378273082-28305-2-git-send-email-sachin.kamat@linaro.org> (raw)
In-Reply-To: <1378273082-28305-1-git-send-email-sachin.kamat@linaro.org>
devm_* simplifies the code.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
drivers/regulator/max1586.c | 26 +++++---------------------
1 file changed, 5 insertions(+), 21 deletions(-)
diff --git a/drivers/regulator/max1586.c b/drivers/regulator/max1586.c
index 54af610..3abf76a 100644
--- a/drivers/regulator/max1586.c
+++ b/drivers/regulator/max1586.c
@@ -166,7 +166,7 @@ static int max1586_pmic_probe(struct i2c_client *client,
struct max1586_platform_data *pdata = client->dev.platform_data;
struct regulator_config config = { };
struct max1586_data *max1586;
- int i, id, ret = -ENOMEM;
+ int i, id;
max1586 = devm_kzalloc(&client->dev, sizeof(struct max1586_data) +
sizeof(struct regulator_dev *) * (MAX1586_V6 + 1),
@@ -193,7 +193,7 @@ static int max1586_pmic_probe(struct i2c_client *client,
continue;
if (id < MAX1586_V3 || id > MAX1586_V6) {
dev_err(&client->dev, "invalid regulator id %d\n", id);
- goto err;
+ return -EINVAL;
}
if (id == MAX1586_V3) {
@@ -207,33 +207,18 @@ static int max1586_pmic_probe(struct i2c_client *client,
config.init_data = pdata->subdevs[i].platform_data;
config.driver_data = max1586;
- rdev[i] = regulator_register(&max1586_reg[id], &config);
+ rdev[i] = devm_regulator_register(&client->dev,
+ &max1586_reg[id], &config);
if (IS_ERR(rdev[i])) {
- ret = PTR_ERR(rdev[i]);
dev_err(&client->dev, "failed to register %s\n",
max1586_reg[id].name);
- goto err;
+ return PTR_ERR(rdev[i]);
}
}
i2c_set_clientdata(client, max1586);
dev_info(&client->dev, "Maxim 1586 regulator driver loaded\n");
return 0;
-
-err:
- while (--i >= 0)
- regulator_unregister(rdev[i]);
- return ret;
-}
-
-static int max1586_pmic_remove(struct i2c_client *client)
-{
- struct max1586_data *max1586 = i2c_get_clientdata(client);
- int i;
-
- for (i = 0; i <= MAX1586_V6; i++)
- regulator_unregister(max1586->rdev[i]);
- return 0;
}
static const struct i2c_device_id max1586_id[] = {
@@ -244,7 +229,6 @@ MODULE_DEVICE_TABLE(i2c, max1586_id);
static struct i2c_driver max1586_pmic_driver = {
.probe = max1586_pmic_probe,
- .remove = max1586_pmic_remove,
.driver = {
.name = "max1586",
.owner = THIS_MODULE,
--
1.7.9.5
next prev parent reply other threads:[~2013-09-04 5:56 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-04 5:37 [PATCH 1/9] regulator: max77686: " Sachin Kamat
2013-09-04 5:37 ` Sachin Kamat [this message]
2013-09-04 5:37 ` [PATCH 3/9] regulator: max77693: " Sachin Kamat
2013-09-04 5:37 ` [PATCH 4/9] regulator: max8649: " Sachin Kamat
2013-09-04 5:37 ` [PATCH 5/9] regulator: max8660: " Sachin Kamat
2013-09-04 5:37 ` [PATCH 6/9] regulator: max8907-regulator: " Sachin Kamat
2013-09-04 5:38 ` [PATCH 7/9] regulator: max8973-regulator: " Sachin Kamat
2013-09-04 5:38 ` [PATCH 8/9] regulator: max8997: " Sachin Kamat
2013-09-04 5:38 ` [PATCH 9/9] regulator: max8998: " Sachin Kamat
2013-09-04 9:52 ` [PATCH 1/9] regulator: max77686: " 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=1378273082-28305-2-git-send-email-sachin.kamat@linaro.org \
--to=sachin.kamat@linaro.org \
--cc=broonie@kernel.org \
--cc=haojian.zhuang@marvell.com \
--cc=jack.yoo@maxim-ic.com \
--cc=jonghwa3.lee@samsung.com \
--cc=kyungmin.park@samsung.com \
--cc=ldewangan@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=myungjoo.ham@samsung.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®