ASoC: pxa: palm27x: 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/palm27x.c b/sound/soc/pxa/palm27x.c
index 97167048572d400797e1e283079eb3cfdfad8371..d973f9ba9fd742a1d2da9751d25e60ac3cf2526e 100644 (file)
--- a/sound/soc/pxa/palm27x.c
+++ b/sound/soc/pxa/palm27x.c
@@ -87,23 +87,27 @@ static int palm27x_ac97_init(struct snd_soc_pcm_runtime *rtd)
        return err;
 }
 
+SND_SOC_DAILINK_DEFS(hifi,
+       DAILINK_COMP_ARRAY(COMP_CPU("pxa2xx-ac97")),
+       DAILINK_COMP_ARRAY(COMP_CODEC("wm9712-codec", "wm9712-hifi")),
+       DAILINK_COMP_ARRAY(COMP_PLATFORM("pxa-pcm-audio")));
+
+SND_SOC_DAILINK_DEFS(aux,
+       DAILINK_COMP_ARRAY(COMP_CPU("pxa2xx-ac97-aux")),
+       DAILINK_COMP_ARRAY(COMP_CODEC("wm9712-codec", "wm9712-aux")),
+       DAILINK_COMP_ARRAY(COMP_PLATFORM("pxa-pcm-audio")));
+
 static struct snd_soc_dai_link palm27x_dai[] = {
 {
        .name = "AC97 HiFi",
        .stream_name = "AC97 HiFi",
-       .cpu_dai_name = "pxa2xx-ac97",
-       .codec_dai_name =  "wm9712-hifi",
-       .codec_name = "wm9712-codec",
-       .platform_name = "pxa-pcm-audio",
        .init = palm27x_ac97_init,
+       SND_SOC_DAILINK_REG(hifi),
 },
 {
        .name = "AC97 Aux",
        .stream_name = "AC97 Aux",
-       .cpu_dai_name = "pxa2xx-ac97-aux",
-       .codec_dai_name = "wm9712-aux",
-       .codec_name = "wm9712-codec",
-       .platform_name = "pxa-pcm-audio",
+       SND_SOC_DAILINK_REG(aux),
 },
 };