2 files changed, 32 insertions, 18 deletions

diff --git a/drivers/regulator/ab8500-ext.c b/drivers/regulator/ab8500-ext.c
index e4975bc61e81..95f495f51d00 100644
--- a/drivers/regulator/ab8500-ext.c
+++ b/drivers/regulator/ab8500-ext.c
@@ -333,7 +333,7 @@ static struct ab8500_ext_regulator_info
         },
 };
 
-int ab8500_ext_regulator_init(struct platform_device *pdev)
+int ab8500_ext_regulator_probe(struct platform_device *pdev)
 {
         struct ab8500 *ab8500 = dev_get_drvdata(pdev->dev.parent);
         struct ab8500_platform_data *ppdata;
@@ -409,7 +409,7 @@ int ab8500_ext_regulator_init(struct platform_device *pdev)
         return 0;
 }
 
-void ab8500_ext_regulator_exit(struct platform_device *pdev)
+int ab8500_ext_regulator_remove(struct platform_device *pdev)
 {
         int i;
 
@@ -422,7 +422,36 @@ void ab8500_ext_regulator_exit(struct platform_device *pdev)
 
                 regulator_unregister(info->rdev);
         }
+
+        return 0;
+}
+
+static struct platform_driver ab8500_ext_regulator_driver = {
+        .probe = ab8500_ext_regulator_probe,
+        .remove = ab8500_ext_regulator_remove,
+        .driver         = {
+                .name   = "ab8500-ext-regulator",
+                .owner  = THIS_MODULE,
+        },
+};
+
+static int __init ab8500_ext_regulator_init(void)
+{
+        int ret;
+
+        ret = platform_driver_register(&ab8500_ext_regulator_driver);
+        if (ret)
+                pr_err("Failed to register ab8500 ext regulator: %d\n", ret);
+
+        return ret;
+}
+subsys_initcall(ab8500_ext_regulator_init);
+
+static void __exit ab8500_ext_regulator_exit(void)
+{
+        platform_driver_unregister(&ab8500_ext_regulator_driver);
 }
+module_exit(ab8500_ext_regulator_exit);
 
 MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("Bengt Jonsson <bengt.g.jonsson@stericsson.com>");
diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index f6656b8c28b6..dfc790196b34 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -3156,22 +3156,12 @@ static int ab8500_regulator_probe(struct platform_device *pdev)
                         return err;
         }
 
-        if (!is_ab8505(ab8500)) {
-                /* register external regulators (before Vaux1, 2 and 3) */
-                err = ab8500_ext_regulator_init(pdev);
-                if (err)
-                        return err;
-        }
-
         /* register all regulators */
         for (i = 0; i < abx500_regulator.info_size; i++) {
                 err = ab8500_regulator_register(pdev, &pdata->regulator[i],
                                                 i, NULL);
-                if (err < 0) {
-                        if (!is_ab8505(ab8500))
-                                ab8500_ext_regulator_exit(pdev);
+                if (err < 0)
                         return err;
-                }
         }
 
         return 0;
@@ -3180,7 +3170,6 @@ static int ab8500_regulator_probe(struct platform_device *pdev)
 static int ab8500_regulator_remove(struct platform_device *pdev)
 {
         int i, err;
-        struct ab8500 *ab8500 = dev_get_drvdata(pdev->dev.parent);
 
         for (i = 0; i < abx500_regulator.info_size; i++) {
                 struct ab8500_regulator_info *info = NULL;
@@ -3192,10 +3181,6 @@ static int ab8500_regulator_remove(struct platform_device *pdev)
                 regulator_unregister(info->regulator);
         }
 
-        /* remove external regulators (after Vaux1, 2 and 3) */
-        if (!is_ab8505(ab8500))
-                ab8500_ext_regulator_exit(pdev);
-
         /* remove regulator debug */
         err = ab8500_regulator_debug_exit(pdev);
         if (err)