ASoC: pxa: mioa701_wm9713: use modern dai_link style

ASoC is now supporting modern style dai_link
(= snd_soc_dai_link_component) for CPU/Codec/Platform.
This patch switches to use it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/pxa/mioa701_wm9713.c b/sound/soc/pxa/mioa701_wm9713.c
index 47052fe3f5f4fce7498f9d04a351ae991f4558df..6244e5caddbeed2ca2672119c06cf86d9aae6b8e 100644 (file)
--- a/sound/soc/pxa/mioa701_wm9713.c
+++ b/sound/soc/pxa/mioa701_wm9713.c
@@ -142,25 +142,29 @@ static int mioa701_wm9713_init(struct snd_soc_pcm_runtime *rtd)
 
 static struct snd_soc_ops mioa701_ops;
 
+SND_SOC_DAILINK_DEFS(ac97,
+       DAILINK_COMP_ARRAY(COMP_CPU("pxa2xx-ac97")),
+       DAILINK_COMP_ARRAY(COMP_CODEC("wm9713-codec", "wm9713-hifi")),
+       DAILINK_COMP_ARRAY(COMP_PLATFORM("pxa-pcm-audio")));
+
+SND_SOC_DAILINK_DEFS(ac97_aux,
+       DAILINK_COMP_ARRAY(COMP_CPU("pxa2xx-ac97-aux")),
+       DAILINK_COMP_ARRAY(COMP_CODEC("wm9713-codec", "wm9713-aux")),
+       DAILINK_COMP_ARRAY(COMP_PLATFORM("pxa-pcm-audio")));
+
 static struct snd_soc_dai_link mioa701_dai[] = {
        {
                .name = "AC97",
                .stream_name = "AC97 HiFi",
-               .cpu_dai_name = "pxa2xx-ac97",
-               .codec_dai_name = "wm9713-hifi",
-               .codec_name = "wm9713-codec",
                .init = mioa701_wm9713_init,
-               .platform_name = "pxa-pcm-audio",
                .ops = &mioa701_ops,
+               SND_SOC_DAILINK_REG(ac97),
        },
        {
                .name = "AC97 Aux",
                .stream_name = "AC97 Aux",
-               .cpu_dai_name = "pxa2xx-ac97-aux",
-               .codec_dai_name = "wm9713-aux",
-               .codec_name = "wm9713-codec",
-               .platform_name = "pxa-pcm-audio",
                .ops = &mioa701_ops,
+               SND_SOC_DAILINK_REG(ac97_aux),
        },
 };