mfd: mfd_cell is now implicitly available to wl1273 drivers

The cell's platform_data is now accessed with a helper function;
change clients to use that, and remove the now-unused data_size.

Signed-off-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/drivers/media/radio/radio-wl1273.c b/drivers/media/radio/radio-wl1273.c
index 7ecc8e657663edba0c23a6b2cbb1628f1e7dd606..4698eb00b59fc99b127fa9c1c596530ad352d07c 100644 (file)
--- 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 6bb51364dcb4d1182a1563d1c22d1ceea066e98f..b4823bf9523b1bcffa5a58ec8028802da860eed7 100644 (file)
--- 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 861b28f543d2d46d60ff00903603319550e80573..1ad0d5aecece986f2ae5c9c8680bd7ef3b1d6696 100644 (file)
--- 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;