diff options
| author | Andres Salomon <dilinger@queued.net> | 2011-02-17 19:07:15 -0800 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-25 17:58:20 -0400 |
| commit | 76a244badbce1135178a17db53298c47e7adb208 (patch) | |
| tree | 92398684777e0a5e447822fc4e53edb05a895bae /drivers/net | |
| parent | 73bd5cf8e86fa3944e7ab5aeeeb51754d5f24331 (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>
(cherry picked from commit e46dccff341068d8530610a822965794f70b998f)
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 928b2b83cef..efd44afeae8 100644 --- a/drivers/net/ks8842.c +++ b/drivers/net/ks8842.c @@ -26,6 +26,7 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/platform_device.h> +#include <linux/mfd/core.h> #include <linux/netdevice.h> #include <linux/etherdevice.h> #include <linux/ethtool.h> @@ -1145,7 +1146,7 @@ static int __devinit ks8842_probe(struct platform_device *pdev) struct resource *iomem; struct net_device *netdev; struct ks8842_adapter *adapter; - struct ks8842_platform_data *pdata = pdev->dev.platform_data; + struct ks8842_platform_data *pdata = mfd_get_data(pdev); u16 id; unsigned i; |