Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8615e4cba1d3a0f15b9a4da9f32f8fbc3488fa54

Authored by Andres Salomon
Committed by Samuel Ortiz
1 parent 6a3521ad3d
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 3 changed files with 4 additions and 3 deletions Side-by-side Diff

drivers/gpio/janz-ttl.c
Diff comments   View file @ 8615e4c
... ... @@ -15,6 +15,7 @@
15 15 #include <linux/interrupt.h>
16 16 #include <linux/delay.h>
17 17 #include <linux/platform_device.h>
  18 +#include <linux/mfd/core.h>
18 19 #include <linux/io.h>
19 20 #include <linux/gpio.h>
20 21 #include <linux/slab.h>
... ... @@ -149,7 +150,7 @@
149 150 struct resource *res;
150 151 int ret;
151 152  
152   - pdata = pdev->dev.platform_data;
  153 + pdata = mfd_get_data(pdev);
153 154 if (!pdata) {
154 155 dev_err(dev, "no platform data\n");
155 156 ret = -ENXIO;
drivers/mfd/janz-cmodio.c
Diff comments   View file @ 8615e4c
... ... @@ -87,7 +87,6 @@
87 87 /* Add platform data */
88 88 pdata->modno = modno;
89 89 cell->platform_data = pdata;
90   - cell->data_size = sizeof(*pdata);
91 90  
92 91 /* MODULbus registers -- PCI BAR3 is big-endian MODULbus access */
93 92 res->flags = IORESOURCE_MEM;
drivers/net/can/janz-ican3.c
Diff comments   View file @ 8615e4c
... ... @@ -15,6 +15,7 @@
15 15 #include <linux/interrupt.h>
16 16 #include <linux/delay.h>
17 17 #include <linux/platform_device.h>
  18 +#include <linux/mfd/core.h>
18 19  
19 20 #include <linux/netdevice.h>
20 21 #include <linux/can.h>
... ... @@ -1643,7 +1644,7 @@
1643 1644 struct device *dev;
1644 1645 int ret;
1645 1646  
1646   - pdata = pdev->dev.platform_data;
  1647 + pdata = mfd_get_data(pdev);
1647 1648 if (!pdata)
1648 1649 return -ENXIO;
1649 1650