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/tps65090-regulator.c b/drivers/regulator/tps65090-regulator.c
index 7baff2e8765d..6bbf760be80a 100644
--- a/drivers/regulator/tps65090-regulator.c
+++ b/drivers/regulator/tps65090-regulator.c
@@ -137,6 +137,7 @@ static inline struct tps65090_regulator *find_regulator_info(int id)
 static int __devinit tps65090_regulator_probe(struct platform_device *pdev)
 {
         struct tps65090_regulator *ri = NULL;
+        struct regulator_config config = { };
         struct regulator_dev *rdev;
         struct tps65090_regulator_platform_data *tps_pdata;
         int id = pdev->id;
@@ -151,8 +152,11 @@ static int __devinit tps65090_regulator_probe(struct platform_device *pdev)
         tps_pdata = pdev->dev.platform_data;
         ri->dev = &pdev->dev;
 
-        rdev = regulator_register(&ri->desc, &pdev->dev,
-                                &tps_pdata->regulator, ri, NULL);
+        config.dev = &pdev->dev;
+        config.init_data = &tps_pdata->regulator;
+        config.driver_data = ri;
+
+        rdev = regulator_register(&ri->desc, &config);
         if (IS_ERR(rdev)) {
                 dev_err(&pdev->dev, "failed to register regulator %s\n",
                                 ri->desc.name);