diff options
author | Samuel Ortiz <sameo@linux.intel.com> | 2011-04-06 10:02:25 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-05-26 13:45:08 -0400 |
commit | 3d2bdf759f48f9b0a0ffcd798f3e9a3228d6455d (patch) | |
tree | 5440763147e844a5e5f83926fe717bef3b7d6fee /drivers/gpio/janz-ttl.c | |
parent | c8a03c96b61bd03a3603bfe5381848c0b40e99be (diff) |
mfd: Use mfd cell platform_data for janz cells platform bits
With the addition of a platform device mfd_cell pointer, MFD drivers
can go back to passing platform data back to their sub drivers.
This allows for an mfd_cell->mfd_data removal and thus keep the
sub drivers MFD agnostic. This is mostly needed for non MFD aware
sub drivers.
Cc: Ira W. Snyder <iws@ovro.caltech.edu>
Cc: Wolfgang Grandegger <wg@grandegger.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/gpio/janz-ttl.c')
-rw-r--r-- | drivers/gpio/janz-ttl.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpio/janz-ttl.c b/drivers/gpio/janz-ttl.c index 2514fb075f4a..813ac077e5d7 100644 --- a/drivers/gpio/janz-ttl.c +++ b/drivers/gpio/janz-ttl.c | |||
@@ -15,7 +15,6 @@ | |||
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> | ||
19 | #include <linux/io.h> | 18 | #include <linux/io.h> |
20 | #include <linux/gpio.h> | 19 | #include <linux/gpio.h> |
21 | #include <linux/slab.h> | 20 | #include <linux/slab.h> |
@@ -150,7 +149,7 @@ static int __devinit ttl_probe(struct platform_device *pdev) | |||
150 | struct resource *res; | 149 | struct resource *res; |
151 | int ret; | 150 | int ret; |
152 | 151 | ||
153 | pdata = mfd_get_data(pdev); | 152 | pdata = pdev->dev.platform_data; |
154 | if (!pdata) { | 153 | if (!pdata) { |
155 | dev_err(dev, "no platform data\n"); | 154 | dev_err(dev, "no platform data\n"); |
156 | ret = -ENXIO; | 155 | ret = -ENXIO; |