diff options
author | Samuel Ortiz <sameo@linux.intel.com> | 2011-04-06 10:26:56 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-05-26 13:45:12 -0400 |
commit | 07259a7092e47b9fbb5c8bfdad45fa4c7dbbc051 (patch) | |
tree | 73d3c059141e3b418ac40b3f63a165fc1b326013 /drivers/regulator | |
parent | a7c98ce25cfa600bd614134a82d22bcb7bcb9d65 (diff) |
mfd: Use mfd cell platform_data for 88pm860x cells platform bits
With the addition of a platform device mfd_cell pointer, MFD drivers
can go back to passing platform back to their sub drivers.
This allows for an mfd_cell->mfd_data removal and thus keep the
sub drivers MFD agnostic. This is mostly needed for non MFD aware
sub drivers.
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Liam Girdwood <lrg@slimlogic.co.uk>
Cc: Richard Purdie <rpurdie@rpsys.net>
Acked-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/regulator')
-rw-r--r-- | drivers/regulator/88pm8607.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/regulator/88pm8607.c b/drivers/regulator/88pm8607.c index 859251250b55..784ea7724c7a 100644 --- a/drivers/regulator/88pm8607.c +++ b/drivers/regulator/88pm8607.c | |||
@@ -15,7 +15,6 @@ | |||
15 | #include <linux/platform_device.h> | 15 | #include <linux/platform_device.h> |
16 | #include <linux/regulator/driver.h> | 16 | #include <linux/regulator/driver.h> |
17 | #include <linux/regulator/machine.h> | 17 | #include <linux/regulator/machine.h> |
18 | #include <linux/mfd/core.h> | ||
19 | #include <linux/mfd/88pm860x.h> | 18 | #include <linux/mfd/88pm860x.h> |
20 | 19 | ||
21 | struct pm8607_regulator_info { | 20 | struct pm8607_regulator_info { |
@@ -400,13 +399,9 @@ static int __devinit pm8607_regulator_probe(struct platform_device *pdev) | |||
400 | struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent); | 399 | struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent); |
401 | struct pm8607_regulator_info *info = NULL; | 400 | struct pm8607_regulator_info *info = NULL; |
402 | struct regulator_init_data *pdata; | 401 | struct regulator_init_data *pdata; |
403 | struct mfd_cell *cell; | ||
404 | int i; | 402 | int i; |
405 | 403 | ||
406 | cell = pdev->dev.platform_data; | 404 | pdata = pdev->dev.platform_data; |
407 | if (cell == NULL) | ||
408 | return -ENODEV; | ||
409 | pdata = cell->mfd_data; | ||
410 | if (pdata == NULL) | 405 | if (pdata == NULL) |
411 | return -EINVAL; | 406 | return -EINVAL; |
412 | 407 | ||