regulator: stw481x-vmmc: 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>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/drivers/regulator/stw481x-vmmc.c b/drivers/regulator/stw481x-vmmc.c
index f78857bd6a158ad8b86b5b103fd5ba4bcb7ad8c9..a7e152696a022f4ed20b2175fb2689e21072e3cc 100644 (file)
--- a/drivers/regulator/stw481x-vmmc.c
+++ b/drivers/regulator/stw481x-vmmc.c
@@ -74,7 +74,8 @@ static int stw481x_vmmc_regulator_probe(struct platform_device *pdev)
        config.init_data = of_get_regulator_init_data(&pdev->dev,
                                                      pdev->dev.of_node);
 
-       stw481x->vmmc_regulator = regulator_register(&vmmc_regulator, &config);
+       stw481x->vmmc_regulator = devm_regulator_register(&pdev->dev,
+                                               &vmmc_regulator, &config);
        if (IS_ERR(stw481x->vmmc_regulator)) {
                dev_err(&pdev->dev,
                        "error initializing STw481x VMMC regulator\n");
@@ -85,14 +86,6 @@ static int stw481x_vmmc_regulator_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int stw481x_vmmc_regulator_remove(struct platform_device *pdev)
-{
-       struct stw481x *stw481x = dev_get_platdata(&pdev->dev);
-
-       regulator_unregister(stw481x->vmmc_regulator);
-       return 0;
-}
-
 static const struct of_device_id stw481x_vmmc_match[] = {
        { .compatible = "st,stw481x-vmmc", },
        {},
@@ -105,7 +98,6 @@ static struct platform_driver stw481x_vmmc_regulator_driver = {
                .of_match_table = stw481x_vmmc_match,
        },
        .probe = stw481x_vmmc_regulator_probe,
-       .remove = stw481x_vmmc_regulator_remove,
 };
 
 module_platform_driver(stw481x_vmmc_regulator_driver);