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 3/9] regulator: max77693: Use devm_regulator_register
Date: Wed, 4 Sep 2013 11:07:56 +0530 [thread overview]
Message-ID: <1378273082-28305-3-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/max77693.c | 28 ++++------------------------
1 file changed, 4 insertions(+), 24 deletions(-)
diff --git a/drivers/regulator/max77693.c b/drivers/regulator/max77693.c
index ce4b96c..2054ae1 100644
--- a/drivers/regulator/max77693.c
+++ b/drivers/regulator/max77693.c
@@ -230,7 +230,7 @@ static int max77693_pmic_probe(struct platform_device *pdev)
struct max77693_dev *iodev = dev_get_drvdata(pdev->dev.parent);
struct max77693_pmic_dev *max77693_pmic;
struct max77693_regulator_data *rdata = NULL;
- int num_rdata, i, ret;
+ int num_rdata, i;
struct regulator_config config;
num_rdata = max77693_pmic_init_rdata(&pdev->dev, &rdata);
@@ -266,36 +266,17 @@ static int max77693_pmic_probe(struct platform_device *pdev)
config.init_data = rdata[i].initdata;
config.of_node = rdata[i].of_node;
- max77693_pmic->rdev[i] = regulator_register(®ulators[id],
- &config);
+ max77693_pmic->rdev[i] = devm_regulator_register(&pdev->dev,
+ ®ulators[id], &config);
if (IS_ERR(max77693_pmic->rdev[i])) {
- ret = PTR_ERR(max77693_pmic->rdev[i]);
dev_err(max77693_pmic->dev,
"Failed to initialize regulator-%d\n", id);
max77693_pmic->rdev[i] = NULL;
- goto err;
+ return PTR_ERR(max77693_pmic->rdev[i]);
}
}
return 0;
- err:
- while (--i >= 0)
- regulator_unregister(max77693_pmic->rdev[i]);
-
- return ret;
-}
-
-static int max77693_pmic_remove(struct platform_device *pdev)
-{
- struct max77693_pmic_dev *max77693_pmic = platform_get_drvdata(pdev);
- struct regulator_dev **rdev = max77693_pmic->rdev;
- int i;
-
- for (i = 0; i < max77693_pmic->num_regulators; i++)
- if (rdev[i])
- regulator_unregister(rdev[i]);
-
- return 0;
}
static const struct platform_device_id max77693_pmic_id[] = {
@@ -311,7 +292,6 @@ static struct platform_driver max77693_pmic_driver = {
.owner = THIS_MODULE,
},
.probe = max77693_pmic_probe,
- .remove = max77693_pmic_remove,
.id_table = max77693_pmic_id,
};
--
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 ` [PATCH 2/9] regulator: max1586: " Sachin Kamat
2013-09-04 5:37 ` Sachin Kamat [this message]
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-3-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®