7 files changed, 12 insertions, 8 deletions

diff --git a/drivers/regulator/bq24022.c b/drivers/regulator/bq24022.c
index c175e38a4cd5..6804333492eb 100644
--- a/drivers/regulator/bq24022.c
+++ b/drivers/regulator/bq24022.c
@@ -105,7 +105,7 @@ static int __init bq24022_probe(struct platform_device *pdev)
         ret = gpio_direction_output(pdata->gpio_iset2, 0);
         ret = gpio_direction_output(pdata->gpio_nce, 1);
 
-        bq24022 = regulator_register(&bq24022_desc, &pdev->dev, pdata);
+        bq24022 = regulator_register(&bq24022_desc, &pdev->dev, NULL, pdata);
         if (IS_ERR(bq24022)) {
                 dev_dbg(&pdev->dev, "couldn't register regulator\n");
                 ret = PTR_ERR(bq24022);
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 96c877dd9daf..f17362ac9c61 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1879,17 +1879,18 @@ static int add_regulator_attributes(struct regulator_dev *rdev)
  * regulator_register - register regulator
  * @regulator_desc: regulator to register
  * @dev: struct device for the regulator
+ * @init_data: platform provided init data, passed through by driver
  * @driver_data: private regulator data
  *
  * Called by regulator drivers to register a regulator.
  * Returns 0 on success.
  */
 struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
-        struct device *dev, void *driver_data)
+        struct device *dev, struct regulator_init_data *init_data,
+        void *driver_data)
 {
         static atomic_t regulator_no = ATOMIC_INIT(0);
         struct regulator_dev *rdev;
-        struct regulator_init_data *init_data = dev->platform_data;
         int ret, i;
 
         if (regulator_desc == NULL)
diff --git a/drivers/regulator/da903x.c b/drivers/regulator/da903x.c
index fe77730a7edb..72b15495183c 100644
--- a/drivers/regulator/da903x.c
+++ b/drivers/regulator/da903x.c
@@ -471,7 +471,8 @@ static int __devinit da903x_regulator_probe(struct platform_device *pdev)
         if (ri->desc.id == DA9030_ID_LDO1 || ri->desc.id == DA9030_ID_LDO15)
                 ri->desc.ops = &da9030_regulator_ldo1_15_ops;
 
-        rdev = regulator_register(&ri->desc, &pdev->dev, ri);
+        rdev = regulator_register(&ri->desc, &pdev->dev,
+                                  pdev->dev.platform_data, ri);
         if (IS_ERR(rdev)) {
                 dev_err(&pdev->dev, "failed to register regulator %s\n",
                                 ri->desc.name);
diff --git a/drivers/regulator/pcf50633-regulator.c b/drivers/regulator/pcf50633-regulator.c
index 4cc85ec6e120..cd761d85c8fd 100644
--- a/drivers/regulator/pcf50633-regulator.c
+++ b/drivers/regulator/pcf50633-regulator.c
@@ -284,7 +284,8 @@ static int __devinit pcf50633_regulator_probe(struct platform_device *pdev)
         /* Already set by core driver */
         pcf = platform_get_drvdata(pdev);
 
-        rdev = regulator_register(&regulators[pdev->id], &pdev->dev, pcf);
+        rdev = regulator_register(&regulators[pdev->id], &pdev->dev,
+                                  pdev->dev.platform_data, pcf);
         if (IS_ERR(rdev))
                 return PTR_ERR(rdev);
 
diff --git a/drivers/regulator/wm8350-regulator.c b/drivers/regulator/wm8350-regulator.c
index afad611fbb80..93e0ce5a5c23 100644
--- a/drivers/regulator/wm8350-regulator.c
+++ b/drivers/regulator/wm8350-regulator.c
@@ -1335,9 +1335,9 @@ static int wm8350_regulator_probe(struct platform_device *pdev)
                 break;
         }
 
-
         /* register regulator */
         rdev = regulator_register(&wm8350_reg[pdev->id], &pdev->dev,
+                                  pdev->dev.platform_data,
                                   dev_get_drvdata(&pdev->dev));
         if (IS_ERR(rdev)) {
                 dev_err(&pdev->dev, "failed to register %s\n",
diff --git a/drivers/regulator/wm8400-regulator.c b/drivers/regulator/wm8400-regulator.c
index 56e23d44ba59..6ed43b0dbdfc 100644
--- a/drivers/regulator/wm8400-regulator.c
+++ b/drivers/regulator/wm8400-regulator.c
@@ -294,7 +294,7 @@ static int __devinit wm8400_regulator_probe(struct platform_device *pdev)
         struct regulator_dev *rdev;
 
         rdev = regulator_register(&regulators[pdev->id], &pdev->dev,
-                pdev->dev.driver_data);
+                pdev->dev.platform_data, pdev->dev.driver_data);
 
         if (IS_ERR(rdev))
                 return PTR_ERR(rdev);
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index 6e957aae7629..2254ad93b784 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -138,7 +138,8 @@ struct regulator_desc {
 };
 
 struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
-        struct device *dev, void *driver_data);
+        struct device *dev, struct regulator_init_data *init_data,
+        void *driver_data);
 void regulator_unregister(struct regulator_dev *rdev);
 
 int regulator_notifier_call_chain(struct regulator_dev *rdev,