3 files changed, 3 insertions, 4 deletions

diff --git a/drivers/media/radio/radio-wl1273.c b/drivers/media/radio/radio-wl1273.c
index 7ecc8e657663..4698eb00b59f 100644
--- a/drivers/media/radio/radio-wl1273.c
+++ b/drivers/media/radio/radio-wl1273.c
@@ -2138,7 +2138,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 = pdev->dev.platform_data;
+        struct wl1273_core **core = mfd_get_data(pdev);
         struct wl1273_device *radio;
         struct v4l2_ctrl *ctrl;
         int r = 0;
diff --git a/drivers/mfd/wl1273-core.c b/drivers/mfd/wl1273-core.c
index 6bb51364dcb4..b4823bf9523b 100644
--- a/drivers/mfd/wl1273-core.c
+++ b/drivers/mfd/wl1273-core.c
@@ -79,7 +79,6 @@ static int __devinit wl1273_core_probe(struct i2c_client *client,
         cell = &core->cells[children];
         cell->name = "wl1273_fm_radio";
         cell->platform_data = &core;
-        cell->data_size = sizeof(core);
         children++;
 
         if (pdata->children & WL1273_CODEC_CHILD) {
@@ -88,7 +87,6 @@ static int __devinit wl1273_core_probe(struct i2c_client *client,
                 dev_dbg(&client->dev, "%s: Have codec.\n", __func__);
                 cell->name = "wl1273-codec";
                 cell->platform_data = &core;
-                cell->data_size = sizeof(core);
                 children++;
         }
 
diff --git a/sound/soc/codecs/wl1273.c b/sound/soc/codecs/wl1273.c
index 861b28f543d2..1ad0d5aecece 100644
--- a/sound/soc/codecs/wl1273.c
+++ b/sound/soc/codecs/wl1273.c
@@ -436,7 +436,8 @@ EXPORT_SYMBOL_GPL(wl1273_get_format);
 
 static int wl1273_probe(struct snd_soc_codec *codec)
 {
-        struct wl1273_core **core = codec->dev->platform_data;
+        struct wl1273_core **core =
+                        mfd_get_data(to_platform_device(codec->dev));
         struct wl1273_priv *wl1273;
         int r;