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/wm831x-isink.c b/drivers/regulator/wm831x-isink.c
index 634aac3f2d5f..046fabf648d2 100644
--- a/drivers/regulator/wm831x-isink.c
+++ b/drivers/regulator/wm831x-isink.c
@@ -154,6 +154,7 @@ static __devinit int wm831x_isink_probe(struct platform_device *pdev)
         struct wm831x_pdata *pdata = wm831x->dev->platform_data;
         struct wm831x_isink *isink;
         int id = pdev->id % ARRAY_SIZE(pdata->isink);
+        struct regulator_config config = { };
         struct resource *res;
         int ret, irq;
 
@@ -189,8 +190,11 @@ static __devinit int wm831x_isink_probe(struct platform_device *pdev)
         isink->desc.type = REGULATOR_CURRENT;
         isink->desc.owner = THIS_MODULE;
 
-        isink->regulator = regulator_register(&isink->desc, &pdev->dev,
-                                             pdata->isink[id], isink, NULL);
+        config.dev = pdev->dev.parent;
+        config.init_data = pdata->isink[id];
+        config.driver_data = isink;
+
+        isink->regulator = regulator_register(&isink->desc, &config);
         if (IS_ERR(isink->regulator)) {
                 ret = PTR_ERR(isink->regulator);
                 dev_err(wm831x->dev, "Failed to register ISINK%d: %d\n",