aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator/wm8400-regulator.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/wm8400-regulator.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/wm8400-regulator.c')
-rw-r--r--drivers/regulator/wm8400-regulator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/wm8400-regulator.c b/drivers/regulator/wm8400-regulator.c
index 56e23d44ba59..6ed43b0dbdfc 100644
--- a/drivers/regulator/wm8400-regulator.c
+++ b/drivers/regulator/wm8400-regulator.c
@@ -294,7 +294,7 @@ static int __devinit wm8400_regulator_probe(struct platform_device *pdev)
294 struct regulator_dev *rdev; 294 struct regulator_dev *rdev;
295 295
296 rdev = regulator_register(&regulators[pdev->id], &pdev->dev, 296 rdev = regulator_register(&regulators[pdev->id], &pdev->dev,
297 pdev->dev.driver_data); 297 pdev->dev.platform_data, pdev->dev.driver_data);
298 298
299 if (IS_ERR(rdev)) 299 if (IS_ERR(rdev))
300 return PTR_ERR(rdev); 300 return PTR_ERR(rdev);