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, 6 insertions, 2 deletions

diff --git a/drivers/regulator/rc5t583-regulator.c b/drivers/regulator/rc5t583-regulator.c
index fe094a6140d9..b567c9ec47c1 100644
--- a/drivers/regulator/rc5t583-regulator.c
+++ b/drivers/regulator/rc5t583-regulator.c
@@ -251,6 +251,7 @@ static int __devinit rc5t583_regulator_probe(struct platform_device *pdev)
         struct rc5t583 *rc5t583 = dev_get_drvdata(pdev->dev.parent);
         struct rc5t583_platform_data *pdata = dev_get_platdata(rc5t583->dev);
         struct regulator_init_data *reg_data;
+        struct regulator_config config = { };
         struct rc5t583_regulator *reg = NULL;
         struct rc5t583_regulator *regs;
         struct regulator_dev *rdev;
@@ -300,8 +301,11 @@ static int __devinit rc5t583_regulator_probe(struct platform_device *pdev)
                                 "Failed to configure ext control %d\n", id);
 
 skip_ext_pwr_config:
-                rdev = regulator_register(&ri->desc, &pdev->dev,
-                                        reg_data, reg, NULL);
+                config.dev = &pdev->dev;
+                config.init_data = reg_data;
+                config.driver_data = reg;
+
+                rdev = regulator_register(&ri->desc, &config);
                 if (IS_ERR(rdev)) {
                         dev_err(&pdev->dev, "Failed to register regulator %s\n",
                                                 ri->desc.name);