aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator/da903x.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-01-19 08:37:02 -0500
committerLiam Girdwood <lrg@slimlogic.co.uk>2009-03-31 04:56:21 -0400
commit0527100fd11d9710c7e153d791da78824b7b46fa (patch)
tree358bad2e27b71ceb705365dd8fb4537e07e02cbf /drivers/regulator/da903x.c
parentb136fb4463d13eea129bf090a8a465bba6bf0003 (diff)
regulator: Pass regulator init data as explict argument when registering
Rather than having the regulator init data read from the platform_data member of the struct device that is registered for the regulator make the init data an explict argument passed in when registering. This allows drivers to use the platform data for their own purposes if they wish. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'drivers/regulator/da903x.c')
-rw-r--r--drivers/regulator/da903x.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/regulator/da903x.c b/drivers/regulator/da903x.c
index fe77730a7edb..72b15495183c 100644
--- a/drivers/regulator/da903x.c
+++ b/drivers/regulator/da903x.c
@@ -471,7 +471,8 @@ static int __devinit da903x_regulator_probe(struct platform_device *pdev)
471 if (ri->desc.id == DA9030_ID_LDO1 || ri->desc.id == DA9030_ID_LDO15) 471 if (ri->desc.id == DA9030_ID_LDO1 || ri->desc.id == DA9030_ID_LDO15)
472 ri->desc.ops = &da9030_regulator_ldo1_15_ops; 472 ri->desc.ops = &da9030_regulator_ldo1_15_ops;
473 473
474 rdev = regulator_register(&ri->desc, &pdev->dev, ri); 474 rdev = regulator_register(&ri->desc, &pdev->dev,
475 pdev->dev.platform_data, ri);
475 if (IS_ERR(rdev)) { 476 if (IS_ERR(rdev)) {
476 dev_err(&pdev->dev, "failed to register regulator %s\n", 477 dev_err(&pdev->dev, "failed to register regulator %s\n",
477 ri->desc.name); 478 ri->desc.name);