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

diff --git a/drivers/regulator/lp3971.c b/drivers/regulator/lp3971.c
index 499986e00fb2..981bea9cb9d7 100644
--- a/drivers/regulator/lp3971.c
+++ b/drivers/regulator/lp3971.c
@@ -421,10 +421,15 @@ static int __devinit setup_regulators(struct lp3971 *lp3971,
 
         /* Instantiate the regulators */
         for (i = 0; i < pdata->num_regulators; i++) {
+                struct regulator_config config = { };
                 struct lp3971_regulator_subdev *reg = &pdata->regulators[i];
-                lp3971->rdev[i] = regulator_register(&regulators[reg->id],
-                                lp3971->dev, reg->initdata, lp3971, NULL);
 
+                config.dev = lp3971->dev;
+                config.init_data = reg->initdata;
+                config.driver_data = lp3971;
+
+                lp3971->rdev[i] = regulator_register(&regulators[reg->id],
+                                                     &config);
                 if (IS_ERR(lp3971->rdev[i])) {
                         err = PTR_ERR(lp3971->rdev[i]);
                         dev_err(lp3971->dev, "regulator init failed: %d\n",