summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/stw481x-vmmc.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2015-03-20 07:53:06 +0800
committerMark Brown <broonie@kernel.org>2015-03-21 01:05:56 +0000
commit14aef2919d06bd132f2e6f74f5ccb3caa4c92d54 (patch)
tree203c09764b008f10d7ff0f3253d25eb6784cd839 /drivers/regulator/stw481x-vmmc.c
parentc517d838eb7d07bbe9507871fab3931deccff539 (diff)
downloadblackbird-op-linux-14aef2919d06bd132f2e6f74f5ccb3caa4c92d54.tar.gz
blackbird-op-linux-14aef2919d06bd132f2e6f74f5ccb3caa4c92d54.zip
regulator: stw481x: Remove unused fields from struct stw481x
The mutex lock is not used at all, remove it. The *vmmc_regulator is not necessary, use a local variable in stw481x_vmmc_regulator_probe() instead. Signed-off-by: Axel Lin <axel.lin@ingics.com> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator/stw481x-vmmc.c')
-rw-r--r--drivers/regulator/stw481x-vmmc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/regulator/stw481x-vmmc.c b/drivers/regulator/stw481x-vmmc.c
index 89025f560259..7d2ae3e9e942 100644
--- a/drivers/regulator/stw481x-vmmc.c
+++ b/drivers/regulator/stw481x-vmmc.c
@@ -56,6 +56,7 @@ static int stw481x_vmmc_regulator_probe(struct platform_device *pdev)
{
struct stw481x *stw481x = dev_get_platdata(&pdev->dev);
struct regulator_config config = { };
+ struct regulator_dev *rdev;
int ret;
/* First disable the external VMMC if it's active */
@@ -75,12 +76,11 @@ static int stw481x_vmmc_regulator_probe(struct platform_device *pdev)
pdev->dev.of_node,
&vmmc_regulator);
- stw481x->vmmc_regulator = devm_regulator_register(&pdev->dev,
- &vmmc_regulator, &config);
- if (IS_ERR(stw481x->vmmc_regulator)) {
+ rdev = devm_regulator_register(&pdev->dev, &vmmc_regulator, &config);
+ if (IS_ERR(rdev)) {
dev_err(&pdev->dev,
"error initializing STw481x VMMC regulator\n");
- return PTR_ERR(stw481x->vmmc_regulator);
+ return PTR_ERR(rdev);
}
dev_info(&pdev->dev, "initialized STw481x VMMC regulator\n");
OpenPOWER on IntegriCloud