1 files changed, 3 insertions, 20 deletions

diff --git a/drivers/regulator/max77686.c b/drivers/regulator/max77686.c
index f563057e5690..ae001ccf26f4 100644
--- a/drivers/regulator/max77686.c
+++ b/drivers/regulator/max77686.c
@@ -478,32 +478,16 @@ static int max77686_pmic_probe(struct platform_device *pdev)
                 config.of_node = pdata->regulators[i].of_node;
 
                 max77686->opmode[i] = regulators[i].enable_mask;
-                max77686->rdev[i] = regulator_register(&regulators[i], &config);
+                max77686->rdev[i] = devm_regulator_register(&pdev->dev,
+                                                &regulators[i], &config);
                 if (IS_ERR(max77686->rdev[i])) {
-                        ret = PTR_ERR(max77686->rdev[i]);
                         dev_err(&pdev->dev,
                                 "regulator init failed for %d\n", i);
-                        max77686->rdev[i] = NULL;
-                        goto err;
+                        return PTR_ERR(max77686->rdev[i]);
                 }
         }
 
         return 0;
-err:
-        while (--i >= 0)
-                regulator_unregister(max77686->rdev[i]);
-        return ret;
-}
-
-static int max77686_pmic_remove(struct platform_device *pdev)
-{
-        struct max77686_data *max77686 = platform_get_drvdata(pdev);
-        int i;
-
-        for (i = 0; i < MAX77686_REGULATORS; i++)
-                regulator_unregister(max77686->rdev[i]);
-
-        return 0;
 }
 
 static const struct platform_device_id max77686_pmic_id[] = {
@@ -518,7 +502,6 @@ static struct platform_driver max77686_pmic_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = max77686_pmic_probe,
-        .remove = max77686_pmic_remove,
         .id_table = max77686_pmic_id,
 };