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/max8649.c b/drivers/regulator/max8649.c
index dca7835b381c..991f517c8dc8 100644
--- a/drivers/regulator/max8649.c
+++ b/drivers/regulator/max8649.c
@@ -225,6 +225,7 @@ static int __devinit max8649_regulator_probe(struct i2c_client *client,
 {
         struct max8649_platform_data *pdata = client->dev.platform_data;
         struct max8649_regulator_info *info = NULL;
+        struct regulator_config config = { };
         unsigned int val;
         unsigned char data;
         int ret;
@@ -297,8 +298,11 @@ static int __devinit max8649_regulator_probe(struct i2c_client *client,
                                    MAX8649_RAMP_DOWN);
         }
 
-        info->regulator = regulator_register(&dcdc_desc, &client->dev,
-                                             pdata->regulator, info, NULL);
+        config.dev = &client->dev;
+        config.init_data = pdata->regulator;
+        config.driver_data = info;
+
+        info->regulator = regulator_register(&dcdc_desc, &config);
         if (IS_ERR(info->regulator)) {
                 dev_err(info->dev, "failed to register regulator %s\n",
                         dcdc_desc.name);