diff options
author | Samuel Ortiz <sameo@linux.intel.com> | 2011-05-11 04:33:25 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-05-26 13:45:11 -0400 |
commit | a7c98ce25cfa600bd614134a82d22bcb7bcb9d65 (patch) | |
tree | d8656252c73477f611d01bc5dc962e8976fb88e0 /drivers/regulator/tps6105x-regulator.c | |
parent | a4579ad2bb6557834ebfafc8d2942891516fb4ad (diff) |
mfd: Use mfd cell platform_data for tps6105x cells platform bits
With the addition of a platform device mfd_cell pointer, MFD drivers
can go back to passing platform data 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: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/regulator/tps6105x-regulator.c')
-rw-r--r-- | drivers/regulator/tps6105x-regulator.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/tps6105x-regulator.c b/drivers/regulator/tps6105x-regulator.c index 1661499feda4..a4d7f4540c18 100644 --- a/drivers/regulator/tps6105x-regulator.c +++ b/drivers/regulator/tps6105x-regulator.c | |||
@@ -137,7 +137,7 @@ static struct regulator_desc tps6105x_regulator_desc = { | |||
137 | */ | 137 | */ |
138 | static int __devinit tps6105x_regulator_probe(struct platform_device *pdev) | 138 | static int __devinit tps6105x_regulator_probe(struct platform_device *pdev) |
139 | { | 139 | { |
140 | struct tps6105x *tps6105x = mfd_get_data(pdev); | 140 | struct tps6105x *tps6105x = dev_get_platdata(&pdev->dev); |
141 | struct tps6105x_platform_data *pdata = tps6105x->pdata; | 141 | struct tps6105x_platform_data *pdata = tps6105x->pdata; |
142 | int ret; | 142 | int ret; |
143 | 143 | ||
@@ -164,7 +164,7 @@ static int __devinit tps6105x_regulator_probe(struct platform_device *pdev) | |||
164 | 164 | ||
165 | static int __devexit tps6105x_regulator_remove(struct platform_device *pdev) | 165 | static int __devexit tps6105x_regulator_remove(struct platform_device *pdev) |
166 | { | 166 | { |
167 | struct tps6105x *tps6105x = platform_get_drvdata(pdev); | 167 | struct tps6105x *tps6105x = dev_get_platdata(&pdev->dev); |
168 | regulator_unregister(tps6105x->regulator); | 168 | regulator_unregister(tps6105x->regulator); |
169 | return 0; | 169 | return 0; |
170 | } | 170 | } |