diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2011-04-06 15:57:17 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-05-26 19:45:09 +0200 |
| commit | a4579ad2bb6557834ebfafc8d2942891516fb4ad (patch) | |
| tree | 3a4c19cd9cb685c6bd15a2e124f537db68374c39 /drivers/input/misc/twl4030-vibra.c | |
| parent | 3d2bdf759f48f9b0a0ffcd798f3e9a3228d6455d (diff) | |
| download | linux-3.10-a4579ad2bb6557834ebfafc8d2942891516fb4ad.tar.gz linux-3.10-a4579ad2bb6557834ebfafc8d2942891516fb4ad.tar.bz2 linux-3.10-a4579ad2bb6557834ebfafc8d2942891516fb4ad.zip | |
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/twl4030-vibra.c')
| -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 6a11694e3fc..014dd4ad0d4 100644 --- a/drivers/input/misc/twl4030-vibra.c +++ b/drivers/input/misc/twl4030-vibra.c @@ -29,7 +29,6 @@ #include <linux/workqueue.h> #include <linux/i2c/twl.h> #include <linux/mfd/twl4030-codec.h> -#include <linux/mfd/core.h> #include <linux/input.h> #include <linux/slab.h> @@ -197,7 +196,7 @@ static SIMPLE_DEV_PM_OPS(twl4030_vibra_pm_ops, static int __devinit twl4030_vibra_probe(struct platform_device *pdev) { - struct twl4030_codec_vibra_data *pdata = mfd_get_data(pdev); + struct twl4030_codec_vibra_data *pdata = pdev->dev.platform_data; struct vibra_info *info; int ret; |