Merge remote-tracking branch 'percpu/for-next'

[karo-tx-linux.git] / drivers / regulator / lp8788-buck.c

diff --git a/drivers/regulator/lp8788-buck.c b/drivers/regulator/lp8788-buck.c
index 0b015f2a7fd9e3dd33c0928421f55441b1459467..948afc249e296005207c621d3d3bfbfb39b914e2 100644 (file)
--- a/drivers/regulator/lp8788-buck.c
+++ b/drivers/regulator/lp8788-buck.c
@@ -515,7 +515,7 @@ static int lp8788_buck_probe(struct platform_device *pdev)
        cfg.driver_data = buck;
        cfg.regmap = lp->regmap;
 
-       rdev = regulator_register(&lp8788_buck_desc[id], &cfg);
+       rdev = devm_regulator_register(&pdev->dev, &lp8788_buck_desc[id], &cfg);
        if (IS_ERR(rdev)) {
                ret = PTR_ERR(rdev);
                dev_err(&pdev->dev, "BUCK%d regulator register err = %d\n",
@@ -529,18 +529,8 @@ static int lp8788_buck_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int lp8788_buck_remove(struct platform_device *pdev)
-{
-       struct lp8788_buck *buck = platform_get_drvdata(pdev);
-
-       regulator_unregister(buck->regulator);
-
-       return 0;
-}
-
 static struct platform_driver lp8788_buck_driver = {
        .probe = lp8788_buck_probe,
-       .remove = lp8788_buck_remove,
        .driver = {
                .name = LP8788_DEV_BUCK,
                .owner = THIS_MODULE,