aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2011-04-07 19:23:57 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2011-05-26 13:45:05 -0400
commit3271d382c3ffe61ef3d059ef47e635dbe031030e (patch)
tree2612b0030f0fd85ffe7722cbf195ac061a3eaf76 /drivers/net
parent7dc00a0d14992d0083fefccad7839ac837ea55bc (diff)
mfd: Use mfd cell platform_data for timberdale cells platform bits
With the addition of a device platform 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. Acked-by: Richard Röjfors <richard.rojfors@pelagicore.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ks8842.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ks8842.c b/drivers/net/ks8842.c
index f0d8346d0fa5..4d40626b3bfa 100644
--- a/drivers/net/ks8842.c
+++ b/drivers/net/ks8842.c
@@ -26,7 +26,6 @@
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>
30#include <linux/netdevice.h> 29#include <linux/netdevice.h>
31#include <linux/etherdevice.h> 30#include <linux/etherdevice.h>
32#include <linux/ethtool.h> 31#include <linux/ethtool.h>
@@ -1146,7 +1145,7 @@ static int __devinit ks8842_probe(struct platform_device *pdev)
1146 struct resource *iomem; 1145 struct resource *iomem;
1147 struct net_device *netdev; 1146 struct net_device *netdev;
1148 struct ks8842_adapter *adapter; 1147 struct ks8842_adapter *adapter;
1149 struct ks8842_platform_data *pdata = mfd_get_data(pdev); 1148 struct ks8842_platform_data *pdata = pdev->dev.platform_data;
1150 u16 id; 1149 u16 id;
1151 unsigned i; 1150 unsigned i;
1152 1151