diff options
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 @@ | |||
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> | ||
18 | #include <linux/io.h> | 19 | #include <linux/io.h> |
19 | #include <linux/gpio.h> | 20 | #include <linux/gpio.h> |
20 | #include <linux/slab.h> | 21 | #include <linux/slab.h> |
@@ -149,7 +150,7 @@ static int __devinit ttl_probe(struct platform_device *pdev) | |||
149 | struct resource *res; | 150 | struct resource *res; |
150 | int ret; | 151 | int ret; |
151 | 152 | ||
152 | pdata = pdev->dev.platform_data; | 153 | pdata = mfd_get_data(pdev); |
153 | if (!pdata) { | 154 | if (!pdata) { |
154 | dev_err(dev, "no platform data\n"); | 155 | dev_err(dev, "no platform data\n"); |
155 | ret = -ENXIO; | 156 | 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, | |||
87 | /* Add platform data */ | 87 | /* Add platform data */ |
88 | pdata->modno = modno; | 88 | pdata->modno = modno; |
89 | cell->platform_data = pdata; | 89 | cell->platform_data = pdata; |
90 | cell->data_size = sizeof(*pdata); | ||
91 | 90 | ||
92 | /* MODULbus registers -- PCI BAR3 is big-endian MODULbus access */ | 91 | /* MODULbus registers -- PCI BAR3 is big-endian MODULbus access */ |
93 | res->flags = IORESOURCE_MEM; | 92 | 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 @@ | |||
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> | ||
18 | 19 | ||
19 | #include <linux/netdevice.h> | 20 | #include <linux/netdevice.h> |
20 | #include <linux/can.h> | 21 | #include <linux/can.h> |
@@ -1643,7 +1644,7 @@ static int __devinit ican3_probe(struct platform_device *pdev) | |||
1643 | struct device *dev; | 1644 | struct device *dev; |
1644 | int ret; | 1645 | int ret; |
1645 | 1646 | ||
1646 | pdata = pdev->dev.platform_data; | 1647 | pdata = mfd_get_data(pdev); |
1647 | if (!pdata) | 1648 | if (!pdata) |
1648 | return -ENXIO; | 1649 | return -ENXIO; |
1649 | 1650 | ||