Skip to content

Commit

Permalink
regulator: db8500-prcmu: use devm_regulator_register()
Browse files Browse the repository at this point in the history
Use devm_regulator_register() to make cleanup paths simpler.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
  • Loading branch information
Jingoo Han authored and Mark Brown committed Dec 9, 2013
1 parent 6ce4eac commit 92dfbdb
Showing 1 changed file with 1 addition and 19 deletions.
20 changes: 1 addition & 19 deletions drivers/regulator/db8500-prcmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -431,17 +431,11 @@ static int db8500_regulator_register(struct platform_device *pdev,
config.of_node = np;

/* register with the regulator framework */
info->rdev = regulator_register(&info->desc, &config);
info->rdev = devm_regulator_register(&pdev->dev, &info->desc, &config);
if (IS_ERR(info->rdev)) {
err = PTR_ERR(info->rdev);
dev_err(&pdev->dev, "failed to register %s: err %i\n",
info->desc.name, err);

/* if failing, unregister all earlier regulators */
while (--id >= 0) {
info = &dbx500_regulator_info[id];
regulator_unregister(info->rdev);
}
return err;
}

Expand Down Expand Up @@ -530,20 +524,8 @@ static int db8500_regulator_probe(struct platform_device *pdev)

static int db8500_regulator_remove(struct platform_device *pdev)
{
int i;

ux500_regulator_debug_exit();

for (i = 0; i < ARRAY_SIZE(dbx500_regulator_info); i++) {
struct dbx500_regulator_info *info;
info = &dbx500_regulator_info[i];

dev_vdbg(rdev_get_dev(info->rdev),
"regulator-%s-remove\n", info->desc.name);

regulator_unregister(info->rdev);
}

return 0;
}

Expand Down

0 comments on commit 92dfbdb

Please sign in to comment.