diff options
author | Samuel Ortiz <sameo@linux.intel.com> | 2011-04-06 09:57:17 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-05-26 13:45:09 -0400 |
commit | a4579ad2bb6557834ebfafc8d2942891516fb4ad (patch) | |
tree | 3a4c19cd9cb685c6bd15a2e124f537db68374c39 /drivers/input/misc | |
parent | 3d2bdf759f48f9b0a0ffcd798f3e9a3228d6455d (diff) |
mfd: Use mfd cell platform_data for twl4030 codec 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: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Liam Girdwood <lrg@slimlogic.co.uk>
Cc: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/input/misc')
-rw-r--r-- | drivers/input/misc/twl4030-vibra.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/misc/twl4030-vibra.c b/drivers/input/misc/twl4030-vibra.c index 6a11694e3fc7..014dd4ad0d4f 100644 --- a/drivers/input/misc/twl4030-vibra.c +++ b/drivers/input/misc/twl4030-vibra.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include <linux/workqueue.h> | 29 | #include <linux/workqueue.h> |
30 | #include <linux/i2c/twl.h> | 30 | #include <linux/i2c/twl.h> |
31 | #include <linux/mfd/twl4030-codec.h> | 31 | #include <linux/mfd/twl4030-codec.h> |
32 | #include <linux/mfd/core.h> | ||
33 | #include <linux/input.h> | 32 | #include <linux/input.h> |
34 | #include <linux/slab.h> | 33 | #include <linux/slab.h> |
35 | 34 | ||
@@ -197,7 +196,7 @@ static SIMPLE_DEV_PM_OPS(twl4030_vibra_pm_ops, | |||
197 | 196 | ||
198 | static int __devinit twl4030_vibra_probe(struct platform_device *pdev) | 197 | static int __devinit twl4030_vibra_probe(struct platform_device *pdev) |
199 | { | 198 | { |
200 | struct twl4030_codec_vibra_data *pdata = mfd_get_data(pdev); | 199 | struct twl4030_codec_vibra_data *pdata = pdev->dev.platform_data; |
201 | struct vibra_info *info; | 200 | struct vibra_info *info; |
202 | int ret; | 201 | int ret; |
203 | 202 | ||