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/s5m8767.c b/drivers/regulator/s5m8767.c
index a2afc0edc5a4..10c38f9ae787 100644
--- a/drivers/regulator/s5m8767.c
+++ b/drivers/regulator/s5m8767.c
@@ -579,6 +579,7 @@ static __devinit int s5m8767_pmic_probe(struct platform_device *pdev)
 {
         struct s5m87xx_dev *iodev = dev_get_drvdata(pdev->dev.parent);
         struct s5m_platform_data *pdata = dev_get_platdata(iodev->dev);
+        struct regulator_config config = { };
         struct regulator_dev **rdev;
         struct s5m8767_info *s5m8767;
         int i, ret, size;
@@ -774,8 +775,11 @@ static __devinit int s5m8767_pmic_probe(struct platform_device *pdev)
                         regulators[id].n_voltages =
                                 (desc->max - desc->min) / desc->step + 1;
 
-                rdev[i] = regulator_register(&regulators[id], s5m8767->dev,
-                                pdata->regulators[i].initdata, s5m8767, NULL);
+                config.dev = s5m8767->dev;
+                config.init_data = pdata->regulators[i].initdata;
+                config.driver_data = s5m8767;
+
+                rdev[i] = regulator_register(&regulators[id], &config);
                 if (IS_ERR(rdev[i])) {
                         ret = PTR_ERR(rdev[i]);
                         dev_err(s5m8767->dev, "regulator init failed for %d\n",