regulator: core: Use a struct to pass in regulator runtime configuration

Rather than adding new arguments to regulator_register() every time we
want to add a new bit of dynamic information at runtime change the function
to take these via a struct. By doing this we avoid needing to do further
changes like the recent addition of device tree support which required each
regulator driver to be updated to take an additional parameter.

The regulator_desc which should (mostly) be static data is still passed
separately as most drivers are able to configure this statically at build
time.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/regulator/wm8400-regulator.c b/drivers/regulator/wm8400-regulator.c
index 8477153780b..4408b7802e7 100644
--- a/drivers/regulator/wm8400-regulator.c
+++ b/drivers/regulator/wm8400-regulator.c
@@ -323,11 +323,14 @@ static struct regulator_desc regulators[] = {
 static int __devinit wm8400_regulator_probe(struct platform_device *pdev)
 {
         struct wm8400 *wm8400 = container_of(pdev, struct wm8400, regulators[pdev->id]);
+        struct regulator_config config = { };
         struct regulator_dev *rdev;
 
-        rdev = regulator_register(&regulators[pdev->id], &pdev->dev,
-                                  pdev->dev.platform_data, wm8400, NULL);
+        config.dev = &pdev->dev;
+        config.init_data = pdev->dev.platform_data;
+        config.driver_data = wm8400;
 
+        rdev = regulator_register(&regulators[pdev->id], &config);
         if (IS_ERR(rdev))
                 return PTR_ERR(rdev);