diff options
-rw-r--r-- | drivers/mfd/wm8400-core.c | 3 | ||||
-rw-r--r-- | sound/soc/codecs/wm8400.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mfd/wm8400-core.c b/drivers/mfd/wm8400-core.c index 3a6e78cb0384..597f82edacaa 100644 --- a/drivers/mfd/wm8400-core.c +++ b/drivers/mfd/wm8400-core.c | |||
@@ -245,7 +245,8 @@ static int wm8400_register_codec(struct wm8400 *wm8400) | |||
245 | { | 245 | { |
246 | struct mfd_cell cell = { | 246 | struct mfd_cell cell = { |
247 | .name = "wm8400-codec", | 247 | .name = "wm8400-codec", |
248 | .mfd_data = wm8400, | 248 | .platform_data = wm8400, |
249 | .pdata_size = sizeof(*wm8400), | ||
249 | }; | 250 | }; |
250 | 251 | ||
251 | return mfd_add_devices(wm8400->dev, -1, &cell, 1, NULL, 0); | 252 | 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 736b785e3756..fbee556cbf35 100644 --- a/sound/soc/codecs/wm8400.c +++ b/sound/soc/codecs/wm8400.c | |||
@@ -1378,7 +1378,7 @@ static void wm8400_probe_deferred(struct work_struct *work) | |||
1378 | 1378 | ||
1379 | static int wm8400_codec_probe(struct snd_soc_codec *codec) | 1379 | static int wm8400_codec_probe(struct snd_soc_codec *codec) |
1380 | { | 1380 | { |
1381 | struct wm8400 *wm8400 = mfd_get_data(to_platform_device(codec->dev)); | 1381 | struct wm8400 *wm8400 = dev_get_platdata(codec->dev); |
1382 | struct wm8400_priv *priv; | 1382 | struct wm8400_priv *priv; |
1383 | int ret; | 1383 | int ret; |
1384 | u16 reg; | 1384 | u16 reg; |