diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-01-19 13:37:02 (GMT) |
|---|---|---|
| committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2009-03-31 08:56:21 (GMT) |
| commit | 0527100fd11d9710c7e153d791da78824b7b46fa (patch) | |
| tree | 358bad2e27b71ceb705365dd8fb4537e07e02cbf /drivers/regulator/core.c | |
| parent | b136fb4463d13eea129bf090a8a465bba6bf0003 (diff) | |
| download | linux-0527100fd11d9710c7e153d791da78824b7b46fa.tar.xz | |
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/core.c')
| -rw-r--r-- | drivers/regulator/core.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 96c877d..f17362a 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1879,17 +1879,18 @@ static int add_regulator_attributes(struct regulator_dev *rdev) * regulator_register - register regulator * @regulator_desc: regulator to register * @dev: struct device for the regulator + * @init_data: platform provided init data, passed through by driver * @driver_data: private regulator data * * Called by regulator drivers to register a regulator. * Returns 0 on success. */ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc, - struct device *dev, void *driver_data) + struct device *dev, struct regulator_init_data *init_data, + void *driver_data) { static atomic_t regulator_no = ATOMIC_INIT(0); struct regulator_dev *rdev; - struct regulator_init_data *init_data = dev->platform_data; int ret, i; if (regulator_desc == NULL) |