1 files changed, 5 insertions, 25 deletions

diff --git a/drivers/regulator/tps80031-regulator.c b/drivers/regulator/tps80031-regulator.c
index 6511d0bfd896..71f457a42623 100644
--- a/drivers/regulator/tps80031-regulator.c
+++ b/drivers/regulator/tps80031-regulator.c
@@ -719,7 +719,7 @@ static int tps80031_regulator_probe(struct platform_device *pdev)
                         if (ret < 0) {
                                 dev_err(&pdev->dev,
                                         "regulator config failed, e %d\n", ret);
-                                goto fail;
+                                return ret;
                         }
 
                         ret = tps80031_power_req_config(pdev->dev.parent,
@@ -727,41 +727,22 @@ static int tps80031_regulator_probe(struct platform_device *pdev)
                         if (ret < 0) {
                                 dev_err(&pdev->dev,
                                         "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)) {
                         dev_err(&pdev->dev,
                                 "register regulator failed %s\n",
                                         ri->rinfo->desc.name);
-                        ret = PTR_ERR(rdev);
-                        goto fail;
+                        return PTR_ERR(rdev);
                 }
                 ri->rdev = rdev;
         }
 
         platform_set_drvdata(pdev, pmic);
         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 = {
@@ -770,7 +751,6 @@ static struct platform_driver tps80031_regulator_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = tps80031_regulator_probe,
-        .remove         = tps80031_regulator_remove,
 };
 
 static int __init tps80031_regulator_init(void)