regulator: s5m8767: Covert to devm_regulator_register()

Signed-off-by: Mark Brown <broonie@linaro.org>
Acked-by: Sangbeom Kim <sbkim73@samsung.com>

1 files changed, 3 insertions, 21 deletions

diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c
index c24448bc43cf..2297fdf9ba7e 100644
--- a/drivers/regulator/s5m8767.c
+++ b/drivers/regulator/s5m8767.c
@@ -910,34 +910,17 @@ static int s5m8767_pmic_probe(struct platform_device *pdev)
                 config.regmap = iodev->regmap;
                 config.of_node = pdata->regulators[i].reg_node;
 
-                rdev[i] = regulator_register(&regulators[id], &config);
+                rdev[i] = devm_regulator_register(&pdev->dev, &regulators[id],
+                                                  &config);
                 if (IS_ERR(rdev[i])) {
                         ret = PTR_ERR(rdev[i]);
                         dev_err(s5m8767->dev, "regulator init failed for %d\n",
                                         id);
-                        rdev[i] = NULL;
-                        goto err;
+                        return ret;
                 }
         }
 
         return 0;
-err:
-        for (i = 0; i < s5m8767->num_regulators; i++)
-                regulator_unregister(rdev[i]);
-
-        return ret;
-}
-
-static int s5m8767_pmic_remove(struct platform_device *pdev)
-{
-        struct s5m8767_info *s5m8767 = platform_get_drvdata(pdev);
-        struct regulator_dev **rdev = s5m8767->rdev;
-        int i;
-
-        for (i = 0; i < s5m8767->num_regulators; i++)
-                regulator_unregister(rdev[i]);
-
-        return 0;
 }
 
 static const struct platform_device_id s5m8767_pmic_id[] = {
@@ -952,7 +935,6 @@ static struct platform_driver s5m8767_pmic_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = s5m8767_pmic_probe,
-        .remove = s5m8767_pmic_remove,
         .id_table = s5m8767_pmic_id,
 };