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/88pm8607.c b/drivers/regulator/88pm8607.c
index 11e5ddd7e796..d04fbe953dd8 100644
--- a/drivers/regulator/88pm8607.c
+++ b/drivers/regulator/88pm8607.c
@@ -365,6 +365,7 @@ static int __devinit pm8607_regulator_probe(struct platform_device *pdev)
         struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent);
         struct pm8607_regulator_info *info = NULL;
         struct regulator_init_data *pdata = pdev->dev.platform_data;
+        struct regulator_config config = { };
         struct resource *res;
         int i;
 
@@ -390,9 +391,12 @@ static int __devinit pm8607_regulator_probe(struct platform_device *pdev)
         if ((i == PM8607_ID_BUCK3) && info->chip->buck3_double)
                 info->slope_double = 1;
 
+        config.dev = &pdev->dev;
+        config.init_data = pdata;
+        config.driver_data = info;
+
         /* replace driver_data with info */
-        info->regulator = regulator_register(&info->desc, &pdev->dev,
-                                             pdata, info, NULL);
+        info->regulator = regulator_register(&info->desc, &config);
         if (IS_ERR(info->regulator)) {
                 dev_err(&pdev->dev, "failed to register regulator %s\n",
                         info->desc.name);