aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/can
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2011-04-06 10:02:25 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2011-05-26 13:45:08 -0400
commit3d2bdf759f48f9b0a0ffcd798f3e9a3228d6455d (patch)
tree5440763147e844a5e5f83926fe717bef3b7d6fee /drivers/net/can
parentc8a03c96b61bd03a3603bfe5381848c0b40e99be (diff)
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.c3
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 @@
15#include <linux/interrupt.h> 15#include <linux/interrupt.h>
16#include <linux/delay.h> 16#include <linux/delay.h>
17#include <linux/platform_device.h> 17#include <linux/platform_device.h>
18#include <linux/mfd/core.h>
19 18
20#include <linux/netdevice.h> 19#include <linux/netdevice.h>
21#include <linux/can.h> 20#include <linux/can.h>
@@ -1644,7 +1643,7 @@ static int __devinit ican3_probe(struct platform_device *pdev)
1644 struct device *dev; 1643 struct device *dev;
1645 int ret; 1644 int ret;
1646 1645
1647 pdata = mfd_get_data(pdev); 1646 pdata = pdev->dev.platform_data;
1648 if (!pdata) 1647 if (!pdata)
1649 return -ENXIO; 1648 return -ENXIO;
1650 1649