regulator: Properly register dummy regulator driver

Recent changes in the driver core appear to mean that the data structures
for the driver core are not fully initialised unless the driver is bound.
Make sure the driver core knows the dummy driver is in use by binding it
to a driver.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>

1 files changed, 26 insertions, 6 deletions

diff --git a/drivers/regulator/dummy.c b/drivers/regulator/dummy.c
index c7410bde7b5d..f6ef6694ab98 100644
--- a/drivers/regulator/dummy.c
+++ b/drivers/regulator/dummy.c
@@ -36,6 +36,29 @@ static struct regulator_desc dummy_desc = {
         .ops = &dummy_ops,
 };
 
+static int __devinit dummy_regulator_probe(struct platform_device *pdev)
+{
+        int ret;
+
+        dummy_regulator_rdev = regulator_register(&dummy_desc, NULL,
+                                                  &dummy_initdata, NULL);
+        if (IS_ERR(dummy_regulator_rdev)) {
+                ret = PTR_ERR(dummy_regulator_rdev);
+                pr_err("Failed to register regulator: %d\n", ret);
+                return ret;
+        }
+
+        return 0;
+}
+
+static struct platform_driver dummy_regulator_driver = {
+        .probe          = dummy_regulator_probe,
+        .driver         = {
+                .name           = "reg-dummy",
+                .owner          = THIS_MODULE,
+        },
+};
+
 static struct platform_device *dummy_pdev;
 
 void __init regulator_dummy_init(void)
@@ -55,12 +78,9 @@ void __init regulator_dummy_init(void)
                 return;
         }
 
-        dummy_regulator_rdev = regulator_register(&dummy_desc, NULL,
-                                                  &dummy_initdata, NULL);
-        if (IS_ERR(dummy_regulator_rdev)) {
-                ret = PTR_ERR(dummy_regulator_rdev);
-                pr_err("Failed to register regulator: %d\n", ret);
+        ret = platform_driver_register(&dummy_regulator_driver);
+        if (ret != 0) {
+                pr_err("Failed to register dummy regulator driver: %d\n", ret);
                 platform_device_unregister(dummy_pdev);
-                return;
         }
 }