diff options
author | Andres Salomon <dilinger@queued.net> | 2011-02-17 22:07:15 -0500 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-03-23 05:41:52 -0400 |
commit | e46dccff341068d8530610a822965794f70b998f (patch) | |
tree | a1f567ef8299629456f8a0309761f7d217a95006 /drivers/net | |
parent | 07ae2a08deb141f22d7974615bd3006e8dce3883 (diff) |
mfd: mfd_cell is now implicitly available to timberdale drivers
The cell's platform_data is now accessed with a helper function;
change clients to use that, and remove the now-unused data_size.
Note that the mfd's platform_data is marked __devinitdata. This
is still correct in all cases except for the timbgpio driver, whose
remove hook has been changed to no longer reference the pdata.
Signed-off-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ks8842.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ks8842.c b/drivers/net/ks8842.c index 928b2b83cef5..efd44afeae83 100644 --- a/drivers/net/ks8842.c +++ b/drivers/net/ks8842.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
27 | #include <linux/module.h> | 27 | #include <linux/module.h> |
28 | #include <linux/platform_device.h> | 28 | #include <linux/platform_device.h> |
29 | #include <linux/mfd/core.h> | ||
29 | #include <linux/netdevice.h> | 30 | #include <linux/netdevice.h> |
30 | #include <linux/etherdevice.h> | 31 | #include <linux/etherdevice.h> |
31 | #include <linux/ethtool.h> | 32 | #include <linux/ethtool.h> |
@@ -1145,7 +1146,7 @@ static int __devinit ks8842_probe(struct platform_device *pdev) | |||
1145 | struct resource *iomem; | 1146 | struct resource *iomem; |
1146 | struct net_device *netdev; | 1147 | struct net_device *netdev; |
1147 | struct ks8842_adapter *adapter; | 1148 | struct ks8842_adapter *adapter; |
1148 | struct ks8842_platform_data *pdata = pdev->dev.platform_data; | 1149 | struct ks8842_platform_data *pdata = mfd_get_data(pdev); |
1149 | u16 id; | 1150 | u16 id; |
1150 | unsigned i; | 1151 | unsigned i; |
1151 | 1152 | ||