Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Jingoo Han and committed by
Mark Brown
0b7bb090 3343fa17

+2 -22
+2 -22
drivers/regulator/lp8788-ldo.c
··· 543 543 cfg.driver_data = ldo; 544 544 cfg.regmap = lp->regmap; 545 545 546 - rdev = regulator_register(&lp8788_dldo_desc[id], &cfg); 546 + rdev = devm_regulator_register(&pdev->dev, &lp8788_dldo_desc[id], &cfg); 547 547 if (IS_ERR(rdev)) { 548 548 ret = PTR_ERR(rdev); 549 549 dev_err(&pdev->dev, "DLDO%d regulator register err = %d\n", ··· 557 557 return 0; 558 558 } 559 559 560 - static int lp8788_dldo_remove(struct platform_device *pdev) 561 - { 562 - struct lp8788_ldo *ldo = platform_get_drvdata(pdev); 563 - 564 - regulator_unregister(ldo->regulator); 565 - 566 - return 0; 567 - } 568 - 569 560 static struct platform_driver lp8788_dldo_driver = { 570 561 .probe = lp8788_dldo_probe, 571 - .remove = lp8788_dldo_remove, 572 562 .driver = { 573 563 .name = LP8788_DEV_DLDO, 574 564 .owner = THIS_MODULE, ··· 593 603 cfg.driver_data = ldo; 594 604 cfg.regmap = lp->regmap; 595 605 596 - rdev = regulator_register(&lp8788_aldo_desc[id], &cfg); 606 + rdev = devm_regulator_register(&pdev->dev, &lp8788_aldo_desc[id], &cfg); 597 607 if (IS_ERR(rdev)) { 598 608 ret = PTR_ERR(rdev); 599 609 dev_err(&pdev->dev, "ALDO%d regulator register err = %d\n", ··· 607 617 return 0; 608 618 } 609 619 610 - static int lp8788_aldo_remove(struct platform_device *pdev) 611 - { 612 - struct lp8788_ldo *ldo = platform_get_drvdata(pdev); 613 - 614 - regulator_unregister(ldo->regulator); 615 - 616 - return 0; 617 - } 618 - 619 620 static struct platform_driver lp8788_aldo_driver = { 620 621 .probe = lp8788_aldo_probe, 621 - .remove = lp8788_aldo_remove, 622 622 .driver = { 623 623 .name = LP8788_DEV_ALDO, 624 624 .owner = THIS_MODULE,