From b68d7f0faac10d3d00a583c88d6ad09f14d9d771 Mon Sep 17 00:00:00 2001
From: Samuel Ortiz <sameo@linux.intel.com>
Date: Wed, 6 Apr 2011 11:56:04 +0200
Subject: [PATCH] --- yaml --- r: 251907 b: refs/heads/master c:
 9e554696c03e04c51d095c1c451e26a8cb6a84fa h: refs/heads/master i:   251905:
 0a966e6f29b8d1480e3495f684d6597a75d2b7dc   251903:
 cf09b58786132a68f0f916de43b7e625fce062c7 v: v3

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

diff --git a/[refs] b/[refs]
index aa585e137a46..8ddbfd953a3c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ac93beaab97d56b6e702cc625438f533e361ea5
+refs/heads/master: 9e554696c03e04c51d095c1c451e26a8cb6a84fa
diff --git a/trunk/drivers/media/radio/radio-wl1273.c b/trunk/drivers/media/radio/radio-wl1273.c
index e2550dc2944f..46cacf845049 100644
--- a/trunk/drivers/media/radio/radio-wl1273.c
+++ b/trunk/drivers/media/radio/radio-wl1273.c
@@ -1990,7 +1990,7 @@ static int wl1273_fm_radio_remove(struct platform_device *pdev)
 
 static int __devinit wl1273_fm_radio_probe(struct platform_device *pdev)
 {
-	struct wl1273_core **core = mfd_get_data(pdev);
+	struct wl1273_core **core = pdev->dev.platform_data;
 	struct wl1273_device *radio;
 	struct v4l2_ctrl *ctrl;
 	int r = 0;
diff --git a/trunk/drivers/mfd/wl1273-core.c b/trunk/drivers/mfd/wl1273-core.c
index 04914f2836c0..63d250d9a366 100644
--- a/trunk/drivers/mfd/wl1273-core.c
+++ b/trunk/drivers/mfd/wl1273-core.c
@@ -217,7 +217,8 @@ static int __devinit wl1273_core_probe(struct i2c_client *client,
 
 	cell = &core->cells[children];
 	cell->name = "wl1273_fm_radio";
-	cell->mfd_data = &core;
+	cell->platform_data = &core;
+	cell->pdata_size = sizeof(core);
 	children++;
 
 	core->read = wl1273_fm_read_reg;
@@ -231,7 +232,8 @@ static int __devinit wl1273_core_probe(struct i2c_client *client,
 
 		dev_dbg(&client->dev, "%s: Have codec.\n", __func__);
 		cell->name = "wl1273-codec";
-		cell->mfd_data = &core;
+		cell->platform_data = &core;
+		cell->pdata_size = sizeof(core);
 		children++;
 	}
 
diff --git a/trunk/sound/soc/codecs/wl1273.c b/trunk/sound/soc/codecs/wl1273.c
index c8a874d0d4ca..5836201834d9 100644
--- a/trunk/sound/soc/codecs/wl1273.c
+++ b/trunk/sound/soc/codecs/wl1273.c
@@ -441,8 +441,7 @@ EXPORT_SYMBOL_GPL(wl1273_get_format);
 
 static int wl1273_probe(struct snd_soc_codec *codec)
 {
-	struct wl1273_core **core =
-			mfd_get_data(to_platform_device(codec->dev));
+	struct wl1273_core **core = codec->dev->platform_data;
 	struct wl1273_priv *wl1273;
 	int r;