From 3b8bcac31ff3833af550044fd700f953d02aac87 Mon Sep 17 00:00:00 2001
From: Samuel Ortiz <sameo@linux.intel.com>
Date: Wed, 11 May 2011 10:44:36 +0200
Subject: [PATCH] --- yaml --- r: 251918 b: refs/heads/master c:
 e45be4b5fcccb241101ad1aa1e15581ad2071393 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/mfd/wm8400-core.c | 3 ++-
 trunk/sound/soc/codecs/wm8400.c | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4c87e952123c..8fcb24d60f11 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb5811cf325f44eb0630b55a6416311e4ba661ee
+refs/heads/master: e45be4b5fcccb241101ad1aa1e15581ad2071393
diff --git a/trunk/drivers/mfd/wm8400-core.c b/trunk/drivers/mfd/wm8400-core.c
index 3a6e78cb0384..597f82edacaa 100644
--- a/trunk/drivers/mfd/wm8400-core.c
+++ b/trunk/drivers/mfd/wm8400-core.c
@@ -245,7 +245,8 @@ static int wm8400_register_codec(struct wm8400 *wm8400)
 {
 	struct mfd_cell cell = {
 		.name = "wm8400-codec",
-		.mfd_data = wm8400,
+		.platform_data = wm8400,
+		.pdata_size = sizeof(*wm8400),
 	};
 
 	return mfd_add_devices(wm8400->dev, -1, &cell, 1, NULL, 0);
diff --git a/trunk/sound/soc/codecs/wm8400.c b/trunk/sound/soc/codecs/wm8400.c
index 736b785e3756..fbee556cbf35 100644
--- a/trunk/sound/soc/codecs/wm8400.c
+++ b/trunk/sound/soc/codecs/wm8400.c
@@ -1378,7 +1378,7 @@ static void wm8400_probe_deferred(struct work_struct *work)
 
 static int wm8400_codec_probe(struct snd_soc_codec *codec)
 {
-	struct wm8400 *wm8400 = mfd_get_data(to_platform_device(codec->dev));
+	struct wm8400 *wm8400 = dev_get_platdata(codec->dev);
 	struct wm8400_priv *priv;
 	int ret;
 	u16 reg;