leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

regulator: tps80031: Use devm_regulator_register

Browse Source 
devm_* simplifies the code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Sachin Kamat 2013-09-04 17:17:53 +05:30 committed by Mark Brown
parent ab1d65e03a
commit 0fb0c82e81
1 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/regulator/tps80031-regulator.c
View File

@ -719,7 +719,7 @@ static int tps80031_regulator_probe(struct platform_device *pdev)
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"regulator config failed, e %d\n", ret); "regulator config failed, e %d\n", ret);
goto fail; return ret;
} }
ret = tps80031_power_req_config(pdev->dev.parent, ret = tps80031_power_req_config(pdev->dev.parent,
@ -727,41 +727,22 @@ static int tps80031_regulator_probe(struct platform_device *pdev)
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"pwr_req config failed, err %d\n", ret); "pwr_req config failed, err %d\n", ret);
goto fail; return ret;
} }
} }
rdev = regulator_register(&ri->rinfo->desc, &config); rdev = devm_regulator_register(&pdev->dev, &ri->rinfo->desc,
&config);
if (IS_ERR(rdev)) { if (IS_ERR(rdev)) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"register regulator failed %s\n", "register regulator failed %s\n",
ri->rinfo->desc.name); ri->rinfo->desc.name);
ret = PTR_ERR(rdev); return PTR_ERR(rdev);
goto fail;
} }
ri->rdev = rdev; ri->rdev = rdev;
} }
platform_set_drvdata(pdev, pmic); platform_set_drvdata(pdev, pmic);
return 0; return 0;
fail:
while (--num >= 0) {
ri = &pmic[num];
regulator_unregister(ri->rdev);
}
return ret;
}
static int tps80031_regulator_remove(struct platform_device *pdev)
{
struct tps80031_regulator *pmic = platform_get_drvdata(pdev);
struct tps80031_regulator *ri = NULL;
int num;
for (num = 0; num < TPS80031_REGULATOR_MAX; ++num) {
ri = &pmic[num];
regulator_unregister(ri->rdev);
}
return 0;
} }
static struct platform_driver tps80031_regulator_driver = { static struct platform_driver tps80031_regulator_driver = {
@ -770,7 +751,6 @@ static struct platform_driver tps80031_regulator_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = tps80031_regulator_probe, .probe = tps80031_regulator_probe,
.remove = tps80031_regulator_remove,
}; };
static int __init tps80031_regulator_init(void) static int __init tps80031_regulator_init(void)