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, 3 deletions

diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
index 9a7d70a9c8d7..b47b005a8d28 100644
--- a/drivers/regulator/fixed.c
+++ b/drivers/regulator/fixed.c
@@ -167,6 +167,7 @@ static int __devinit reg_fixed_voltage_probe(struct platform_device *pdev)
 {
         struct fixed_voltage_config *config;
         struct fixed_voltage_data *drvdata;
+        struct regulator_config cfg = { };
         int ret;
 
         if (pdev->dev.of_node)
@@ -247,9 +248,12 @@ static int __devinit reg_fixed_voltage_probe(struct platform_device *pdev)
                 drvdata->desc.ops = &fixed_voltage_ops;
         }
 
-        drvdata->dev = regulator_register(&drvdata->desc, &pdev->dev,
-                                          config->init_data, drvdata,
-                                          pdev->dev.of_node);
+        cfg.dev = &pdev->dev;
+        cfg.init_data = config->init_data;
+        cfg.driver_data = drvdata;
+        cfg.of_node = pdev->dev.of_node;
+
+        drvdata->dev = regulator_register(&drvdata->desc, &cfg);
         if (IS_ERR(drvdata->dev)) {
                 ret = PTR_ERR(drvdata->dev);
                 dev_err(&pdev->dev, "Failed to register regulator: %d\n", ret);