diff options
| author |   Andres Salomon <dilinger@queued.net> | 2011-02-17 19:07:22 -0800 |
|---|---|---|
| committer |   Samuel Ortiz <sameo@linux.intel.com> | 2011-03-23 10:41:54 +0100 |
| commit | 8615e4cba1d3a0f15b9a4da9f32f8fbc3488fa54 (patch) | |
| tree | 44040fd3c5c8b1f9961a2db1a22f2b1e2bf92b18 /drivers | |
| parent | mfd: mfd_cell is now implicitly available to tc6387xb drivers (diff) | |
| download | linux-dev-8615e4cba1d3a0f15b9a4da9f32f8fbc3488fa54.tar.xz linux-dev-8615e4cba1d3a0f15b9a4da9f32f8fbc3488fa54.zip | |
mfd: mfd_cell is now implicitly available to janz 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.
Signed-off-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpio/janz-ttl.c | 3 | ||||
| -rw-r--r-- | drivers/mfd/janz-cmodio.c | 1 | ||||
| -rw-r--r-- | drivers/net/can/janz-ican3.c | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpio/janz-ttl.c b/drivers/gpio/janz-ttl.c index 813ac077e5d7..2514fb075f4a 100644 --- a/drivers/gpio/janz-ttl.c +++ b/drivers/gpio/janz-ttl.c @@ -15,6 +15,7 @@ #include <linux/interrupt.h> #include <linux/delay.h> #include <linux/platform_device.h> +#include <linux/mfd/core.h> #include <linux/io.h> #include <linux/gpio.h> #include <linux/slab.h> @@ -149,7 +150,7 @@ static int __devinit ttl_probe(struct platform_device *pdev) struct resource *res; int ret; - pdata = pdev->dev.platform_data; + pdata = mfd_get_data(pdev); if (!pdata) { dev_err(dev, "no platform data\n"); ret = -ENXIO; diff --git a/drivers/mfd/janz-cmodio.c b/drivers/mfd/janz-cmodio.c index 36a166bcdb08..58de1e28788e 100644 --- a/drivers/mfd/janz-cmodio.c +++ b/drivers/mfd/janz-cmodio.c @@ -87,7 +87,6 @@ static int __devinit cmodio_setup_subdevice(struct cmodio_device *priv, /* Add platform data */ pdata->modno = modno; cell->platform_data = pdata; - cell->data_size = sizeof(*pdata); /* MODULbus registers -- PCI BAR3 is big-endian MODULbus access */ res->flags = IORESOURCE_MEM; diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c index 366f5cc050ae..102b16c6cc97 100644 --- a/drivers/net/can/janz-ican3.c +++ b/drivers/net/can/janz-ican3.c @@ -15,6 +15,7 @@ #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> @@ -1643,7 +1644,7 @@ static int __devinit ican3_probe(struct platform_device *pdev) struct device *dev; int ret; - pdata = pdev->dev.platform_data; + pdata = mfd_get_data(pdev); if (!pdata) return -ENXIO; |