diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2011-04-06 16:02:25 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-05-26 19:45:08 +0200 |
| commit | 3d2bdf759f48f9b0a0ffcd798f3e9a3228d6455d (patch) | |
| tree | 5440763147e844a5e5f83926fe717bef3b7d6fee /drivers/net/can | |
| parent | c8a03c96b61bd03a3603bfe5381848c0b40e99be (diff) | |
| download | linux-3d2bdf759f48f9b0a0ffcd798f3e9a3228d6455d.tar.gz linux-3d2bdf759f48f9b0a0ffcd798f3e9a3228d6455d.tar.bz2 linux-3d2bdf759f48f9b0a0ffcd798f3e9a3228d6455d.zip | |
mfd: Use mfd cell platform_data for janz 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: Ira W. Snyder <iws@ovro.caltech.edu>
Cc: Wolfgang Grandegger <wg@grandegger.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/net/can')
| -rw-r--r-- | drivers/net/can/janz-ican3.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c index 587fba48cdd9..f1942cab35f6 100644 --- a/drivers/net/can/janz-ican3.c +++ b/drivers/net/can/janz-ican3.c @@ -15,7 +15,6 @@ #include <linux/interrupt.h> #include <linux/delay.h> #include <linux/platform_device.h> -#include <linux/mfd/core.h> #include <linux/netdevice.h> #include <linux/can.h> @@ -1644,7 +1643,7 @@ static int __devinit ican3_probe(struct platform_device *pdev) struct device *dev; int ret; - pdata = mfd_get_data(pdev); + pdata = pdev->dev.platform_data; if (!pdata) return -ENXIO; |