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/aat2870-regulator.c b/drivers/regulator/aat2870-regulator.c
index 7cc380e950f6..7f000d6bb984 100644
--- a/drivers/regulator/aat2870-regulator.c
+++ b/drivers/regulator/aat2870-regulator.c
@@ -178,6 +178,7 @@ static struct aat2870_regulator *aat2870_get_regulator(int id)
 static int aat2870_regulator_probe(struct platform_device *pdev)
 {
         struct aat2870_regulator *ri;
+        struct regulator_config config = { 0 };
         struct regulator_dev *rdev;
 
         ri = aat2870_get_regulator(pdev->id);
@@ -187,8 +188,11 @@ static int aat2870_regulator_probe(struct platform_device *pdev)
         }
         ri->aat2870 = dev_get_drvdata(pdev->dev.parent);
 
-        rdev = regulator_register(&ri->desc, &pdev->dev,
-                                  pdev->dev.platform_data, ri, NULL);
+        config.dev = &pdev->dev;
+        config.driver_data = ri;
+        config.init_data = pdev->dev.platform_data;
+
+        rdev = regulator_register(&ri->desc, &config);
         if (IS_ERR(rdev)) {
                 dev_err(&pdev->dev, "Failed to register regulator %s\n",
                         ri->desc.name);