1 files changed, 9 insertions, 14 deletions

diff --git a/sound/soc/blackfin/bf5xx-ad193x.c b/sound/soc/blackfin/bf5xx-ad193x.c
index b8c9060cfd8e..e4a625317a1a 100644
--- a/sound/soc/blackfin/bf5xx-ad193x.c
+++ b/sound/soc/blackfin/bf5xx-ad193x.c
@@ -49,9 +49,9 @@ static struct snd_soc_card bf5xx_ad193x;
 static int bf5xx_ad193x_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;
 
-        cpu_dai->private_data = sport_handle;
+        snd_soc_dai_set_drvdata(cpu_dai, sport_handle);
         return 0;
 }
 
@@ -59,8 +59,8 @@ static int bf5xx_ad193x_hw_params(struct snd_pcm_substream *substream,
         struct snd_pcm_hw_params *params)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
-        struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;
+        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
+        struct snd_soc_dai *codec_dai = rtd->codec_dai;
         unsigned int channel_map[] = {0, 1, 2, 3, 4, 5, 6, 7};
         int ret = 0;
         /* set cpu DAI configuration */
@@ -97,23 +97,19 @@ static struct snd_soc_ops bf5xx_ad193x_ops = {
 static struct snd_soc_dai_link bf5xx_ad193x_dai = {
         .name = "ad193x",
         .stream_name = "AD193X",
-        .cpu_dai = &bf5xx_tdm_dai,
-        .codec_dai = &ad193x_dai,
+        .cpu_dai_name = "bf5xx-tdm",
+        .codec_dai_name ="ad193x-hifi",
+        .platform_name = "bf5xx-tdm-pcm-audio",
+        .codec_name = "ad193x-codec.5",
         .ops = &bf5xx_ad193x_ops,
 };
 
 static struct snd_soc_card bf5xx_ad193x = {
         .name = "bf5xx_ad193x",
-        .platform = &bf5xx_tdm_soc_platform,
         .dai_link = &bf5xx_ad193x_dai,
         .num_links = 1,
 };
 
-static struct snd_soc_device bf5xx_ad193x_snd_devdata = {
-        .card = &bf5xx_ad193x,
-        .codec_dev = &soc_codec_dev_ad193x,
-};
-
 static struct platform_device *bfxx_ad193x_snd_device;
 
 static int __init bf5xx_ad193x_init(void)
@@ -124,8 +120,7 @@ static int __init bf5xx_ad193x_init(void)
         if (!bfxx_ad193x_snd_device)
                 return -ENOMEM;
 
-        platform_set_drvdata(bfxx_ad193x_snd_device, &bf5xx_ad193x_snd_devdata);
-        bf5xx_ad193x_snd_devdata.dev = &bfxx_ad193x_snd_device->dev;
+        platform_set_drvdata(bfxx_ad193x_snd_device, &bf5xx_ad193x);
         ret = platform_device_add(bfxx_ad193x_snd_device);
 
         if (ret)