Use mfd_data for passing information from mfd drivers to soc clients. The mfd_cell's driver_data field is being phased out.

Clients that were using driver_data now access .mfd_data via mfd_get_data().

Signed-off-by: Andres Salomon dilinger@queued.net --- drivers/mfd/wm8400-core.c | 2 +- sound/soc/codecs/wm8400.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mfd/wm8400-core.c b/drivers/mfd/wm8400-core.c index 1bfef48..3a6e78c 100644 --- a/drivers/mfd/wm8400-core.c +++ b/drivers/mfd/wm8400-core.c @@ -245,7 +245,7 @@ static int wm8400_register_codec(struct wm8400 *wm8400) { struct mfd_cell cell = { .name = "wm8400-codec", - .driver_data = wm8400, + .mfd_data = wm8400, };

return mfd_add_devices(wm8400->dev, -1, &cell, 1, NULL, 0); diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c index 3c3bc07..ee105c2 100644 --- a/sound/soc/codecs/wm8400.c +++ b/sound/soc/codecs/wm8400.c @@ -1377,7 +1377,7 @@ static void wm8400_probe_deferred(struct work_struct *work)

static int wm8400_codec_probe(struct snd_soc_codec *codec) { - struct wm8400 *wm8400 = dev_get_platdata(codec->dev); + struct wm8400 *wm8400 = mfd_get_data(to_platform_device(codec->dev)); struct wm8400_priv *priv; int ret; u16 reg;