aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpio
diff options
context:
space:
mode:
authorAndres Salomon <dilinger@queued.net>2011-02-17 22:07:22 -0500
committerSamuel Ortiz <sameo@linux.intel.com>2011-03-23 05:41:54 -0400
commit8615e4cba1d3a0f15b9a4da9f32f8fbc3488fa54 (patch)
tree44040fd3c5c8b1f9961a2db1a22f2b1e2bf92b18 /drivers/gpio
parent6a3521ad3db45066d4ca38652dd0b57ea2fd0a30 (diff)
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/gpio')
-rw-r--r--drivers/gpio/janz-ttl.c3
1 files changed, 2 insertions, 1 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;