aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator/lp3972.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-04-03 19:50:22 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-04-09 07:37:09 -0400
commitc172708d38a401b2f3f841dfcd862b469fa0b670 (patch)
tree75e89c63fd0c76a2c69bb5ad6e45b3762bceb6b6 /drivers/regulator/lp3972.c
parent1474e4dbcae04125ed6e503eadcef266846f4675 (diff)
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>
Diffstat (limited to 'drivers/regulator/lp3972.c')
-rw-r--r--drivers/regulator/lp3972.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/regulator/lp3972.c b/drivers/regulator/lp3972.c
index fbe3a58a71f..de073df7d34 100644
--- a/drivers/regulator/lp3972.c
+++ b/drivers/regulator/lp3972.c
@@ -527,9 +527,14 @@ static int __devinit setup_regulators(struct lp3972 *lp3972,
527 /* Instantiate the regulators */ 527 /* Instantiate the regulators */
528 for (i = 0; i < pdata->num_regulators; i++) { 528 for (i = 0; i < pdata->num_regulators; i++) {
529 struct lp3972_regulator_subdev *reg = &pdata->regulators[i]; 529 struct lp3972_regulator_subdev *reg = &pdata->regulators[i];
530 lp3972->rdev[i] = regulator_register(&regulators[reg->id], 530 struct regulator_config config = { };
531 lp3972->dev, reg->initdata, lp3972, NULL); 531
532 config.dev = lp3972->dev;
533 config.init_data = reg->initdata;
534 config.driver_data = lp3972;
532 535
536 lp3972->rdev[i] = regulator_register(&regulators[reg->id],
537 &config);
533 if (IS_ERR(lp3972->rdev[i])) { 538 if (IS_ERR(lp3972->rdev[i])) {
534 err = PTR_ERR(lp3972->rdev[i]); 539 err = PTR_ERR(lp3972->rdev[i]);
535 dev_err(lp3972->dev, "regulator init failed: %d\n", 540 dev_err(lp3972->dev, "regulator init failed: %d\n",