mirror of
https://github.com/torvalds/linux
synced 2024-09-21 11:38:48 +00:00
regulator: lp8788-ldo: use devm_regulator_register()
Use devm_regulator_register() to make cleanup paths simpler, and remove unnecessary remove(). Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
parent
3343fa1748
commit
0b7bb09054
|
@ -543,7 +543,7 @@ static int lp8788_dldo_probe(struct platform_device *pdev)
|
||||||
cfg.driver_data = ldo;
|
cfg.driver_data = ldo;
|
||||||
cfg.regmap = lp->regmap;
|
cfg.regmap = lp->regmap;
|
||||||
|
|
||||||
rdev = regulator_register(&lp8788_dldo_desc[id], &cfg);
|
rdev = devm_regulator_register(&pdev->dev, &lp8788_dldo_desc[id], &cfg);
|
||||||
if (IS_ERR(rdev)) {
|
if (IS_ERR(rdev)) {
|
||||||
ret = PTR_ERR(rdev);
|
ret = PTR_ERR(rdev);
|
||||||
dev_err(&pdev->dev, "DLDO%d regulator register err = %d\n",
|
dev_err(&pdev->dev, "DLDO%d regulator register err = %d\n",
|
||||||
|
@ -557,18 +557,8 @@ static int lp8788_dldo_probe(struct platform_device *pdev)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int lp8788_dldo_remove(struct platform_device *pdev)
|
|
||||||
{
|
|
||||||
struct lp8788_ldo *ldo = platform_get_drvdata(pdev);
|
|
||||||
|
|
||||||
regulator_unregister(ldo->regulator);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct platform_driver lp8788_dldo_driver = {
|
static struct platform_driver lp8788_dldo_driver = {
|
||||||
.probe = lp8788_dldo_probe,
|
.probe = lp8788_dldo_probe,
|
||||||
.remove = lp8788_dldo_remove,
|
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = LP8788_DEV_DLDO,
|
.name = LP8788_DEV_DLDO,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
|
@ -603,7 +593,7 @@ static int lp8788_aldo_probe(struct platform_device *pdev)
|
||||||
cfg.driver_data = ldo;
|
cfg.driver_data = ldo;
|
||||||
cfg.regmap = lp->regmap;
|
cfg.regmap = lp->regmap;
|
||||||
|
|
||||||
rdev = regulator_register(&lp8788_aldo_desc[id], &cfg);
|
rdev = devm_regulator_register(&pdev->dev, &lp8788_aldo_desc[id], &cfg);
|
||||||
if (IS_ERR(rdev)) {
|
if (IS_ERR(rdev)) {
|
||||||
ret = PTR_ERR(rdev);
|
ret = PTR_ERR(rdev);
|
||||||
dev_err(&pdev->dev, "ALDO%d regulator register err = %d\n",
|
dev_err(&pdev->dev, "ALDO%d regulator register err = %d\n",
|
||||||
|
@ -617,18 +607,8 @@ static int lp8788_aldo_probe(struct platform_device *pdev)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int lp8788_aldo_remove(struct platform_device *pdev)
|
|
||||||
{
|
|
||||||
struct lp8788_ldo *ldo = platform_get_drvdata(pdev);
|
|
||||||
|
|
||||||
regulator_unregister(ldo->regulator);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct platform_driver lp8788_aldo_driver = {
|
static struct platform_driver lp8788_aldo_driver = {
|
||||||
.probe = lp8788_aldo_probe,
|
.probe = lp8788_aldo_probe,
|
||||||
.remove = lp8788_aldo_remove,
|
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = LP8788_DEV_ALDO,
|
.name = LP8788_DEV_ALDO,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
|
|
Loading…
Reference in a new issue