evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

regulator: mc13783: Use devm_regulator_register

Browse source 
devm_* simplifies the code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Marek Vasut <marex@denx.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Sachin Kamat 2013-09-04 12:00:59 +05:30 • committed by Mark Brown
parent 0ab6e8ca54
commit 8e568635af
1 changed files with 4 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
drivers/regulator/mc13783-regulator.c
View file

@ -400,7 +400,7 @@ static int mc13783_regulator_probe(struct platform_device *pdev)
dev_get_platdata(&pdev->dev); dev_get_platdata(&pdev->dev);
struct mc13xxx_regulator_init_data *mc13xxx_data; struct mc13xxx_regulator_init_data *mc13xxx_data;
struct regulator_config config = { }; struct regulator_config config = { };
int i, ret, num_regulators; int i, num_regulators;
num_regulators = mc13xxx_get_num_regulators_dt(pdev); num_regulators = mc13xxx_get_num_regulators_dt(pdev);
@ -444,31 +444,15 @@ static int mc13783_regulator_probe(struct platform_device *pdev)
config.driver_data = priv; config.driver_data = priv;
config.of_node = node; config.of_node = node;
priv->regulators[i] = regulator_register(desc, &config); priv->regulators[i] = devm_regulator_register(&pdev->dev, desc,
&config);
if (IS_ERR(priv->regulators[i])) { if (IS_ERR(priv->regulators[i])) {
dev_err(&pdev->dev, "failed to register regulator %s\n", dev_err(&pdev->dev, "failed to register regulator %s\n",
mc13783_regulators[i].desc.name); mc13783_regulators[i].desc.name);
ret = PTR_ERR(priv->regulators[i]); return PTR_ERR(priv->regulators[i]);
goto err;
} }
} }
return 0;
err:
while (--i >= 0)
regulator_unregister(priv->regulators[i]);
return ret;
}
static int mc13783_regulator_remove(struct platform_device *pdev)
{
struct mc13xxx_regulator_priv *priv = platform_get_drvdata(pdev);
int i;
for (i = 0; i < priv->num_regulators; i++)
regulator_unregister(priv->regulators[i]);
return 0; return 0;
} }
@ -477,7 +461,6 @@ static struct platform_driver mc13783_regulator_driver = {
.name = "mc13783-regulator", .name = "mc13783-regulator",
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.remove = mc13783_regulator_remove,
.probe = mc13783_regulator_probe, .probe = mc13783_regulator_probe,
}; };