From 1d3e094e6ddc176daaa6eb420c43e503cdec5aab Mon Sep 17 00:00:00 2001
From: Samuel Ortiz <sameo@linux.intel.com>
Date: Wed, 6 Apr 2011 16:02:25 +0200
Subject: [PATCH] --- yaml --- r: 251913 b: refs/heads/master c:
 3d2bdf759f48f9b0a0ffcd798f3e9a3228d6455d h: refs/heads/master i:   251911:
 6b63001a85903310cb7bbd7551dfb40001d62523 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/gpio/janz-ttl.c      | 3 +--
 trunk/drivers/mfd/janz-cmodio.c    | 3 ++-
 trunk/drivers/net/can/janz-ican3.c | 3 +--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 1f90563493c0..52916b3dca00 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8a03c96b61bd03a3603bfe5381848c0b40e99be
+refs/heads/master: 3d2bdf759f48f9b0a0ffcd798f3e9a3228d6455d
diff --git a/trunk/drivers/gpio/janz-ttl.c b/trunk/drivers/gpio/janz-ttl.c
index 2514fb075f4a..813ac077e5d7 100644
--- a/trunk/drivers/gpio/janz-ttl.c
+++ b/trunk/drivers/gpio/janz-ttl.c
@@ -15,7 +15,6 @@
 #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>
@@ -150,7 +149,7 @@ static int __devinit ttl_probe(struct platform_device *pdev)
 	struct resource *res;
 	int ret;
 
-	pdata = mfd_get_data(pdev);
+	pdata = pdev->dev.platform_data;
 	if (!pdata) {
 		dev_err(dev, "no platform data\n");
 		ret = -ENXIO;
diff --git a/trunk/drivers/mfd/janz-cmodio.c b/trunk/drivers/mfd/janz-cmodio.c
index fc4191137e90..5c2a06acb77f 100644
--- a/trunk/drivers/mfd/janz-cmodio.c
+++ b/trunk/drivers/mfd/janz-cmodio.c
@@ -86,7 +86,8 @@ static int __devinit cmodio_setup_subdevice(struct cmodio_device *priv,
 
 	/* Add platform data */
 	pdata->modno = modno;
-	cell->mfd_data = pdata;
+	cell->platform_data = pdata;
+	cell->pdata_size = sizeof(*pdata);
 
 	/* MODULbus registers -- PCI BAR3 is big-endian MODULbus access */
 	res->flags = IORESOURCE_MEM;
diff --git a/trunk/drivers/net/can/janz-ican3.c b/trunk/drivers/net/can/janz-ican3.c
index 587fba48cdd9..f1942cab35f6 100644
--- a/trunk/drivers/net/can/janz-ican3.c
+++ b/trunk/drivers/net/can/janz-ican3.c
@@ -15,7 +15,6 @@
 #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>
@@ -1644,7 +1643,7 @@ static int __devinit ican3_probe(struct platform_device *pdev)
 	struct device *dev;
 	int ret;
 
-	pdata = mfd_get_data(pdev);
+	pdata = pdev->dev.platform_data;
 	if (!pdata)
 		return -ENXIO;