1 files changed, 7 insertions, 12 deletions

diff --git a/sound/soc/blackfin/bf5xx-ad1980.c b/sound/soc/blackfin/bf5xx-ad1980.c
index d8f591273778..a31bdf656fce 100644
--- a/sound/soc/blackfin/bf5xx-ad1980.c
+++ b/sound/soc/blackfin/bf5xx-ad1980.c
@@ -48,10 +48,10 @@ static struct snd_soc_card bf5xx_board;
 static int bf5xx_board_startup(struct snd_pcm_substream *substream)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
+        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
 
         pr_debug("%s enter\n", __func__);
-        cpu_dai->private_data = sport_handle;
+        snd_soc_dai_set_drvdata(cpu_dai, sport_handle);
         return 0;
 }
 
@@ -62,23 +62,19 @@ static struct snd_soc_ops bf5xx_board_ops = {
 static struct snd_soc_dai_link bf5xx_board_dai = {
         .name = "AC97",
         .stream_name = "AC97 HiFi",
-        .cpu_dai = &bfin_ac97_dai,
-        .codec_dai = &ad1980_dai,
+        .cpu_dai_name = "bfin-ac97",
+        .codec_dai_name = "ad1980-hifi",
+        .platform_name = "bfin-pcm-audio",
+        .codec_name = "ad1980-codec",
         .ops = &bf5xx_board_ops,
 };
 
 static struct snd_soc_card bf5xx_board = {
         .name = "bf5xx-board",
-        .platform = &bf5xx_ac97_soc_platform,
         .dai_link = &bf5xx_board_dai,
         .num_links = 1,
 };
 
-static struct snd_soc_device bf5xx_board_snd_devdata = {
-        .card = &bf5xx_board,
-        .codec_dev = &soc_codec_dev_ad1980,
-};
-
 static struct platform_device *bf5xx_board_snd_device;
 
 static int __init bf5xx_board_init(void)
@@ -89,8 +85,7 @@ static int __init bf5xx_board_init(void)
         if (!bf5xx_board_snd_device)
                 return -ENOMEM;
 
-        platform_set_drvdata(bf5xx_board_snd_device, &bf5xx_board_snd_devdata);
-        bf5xx_board_snd_devdata.dev = &bf5xx_board_snd_device->dev;
+        platform_set_drvdata(bf5xx_board_snd_device, &bf5xx_board);
         ret = platform_device_add(bf5xx_board_snd_device);
 
         if (ret)