ASoC: pxa: tosa: use modern dai_link style

[sfrench/cifs-2.6.git] / sound / soc / pxa / tosa.c

diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c
index ae9c12e1ea2aeccd1941e5a6e2997ed367b2833e..e7cb450d9e8ae7ea033d9ced63651a0cb5f03c4f 100644 (file)
--- a/sound/soc/pxa/tosa.c
+++ b/sound/soc/pxa/tosa.c
@@ -182,24 +182,28 @@ static const struct snd_kcontrol_new tosa_controls[] = {
                tosa_set_spk),
 };
 
+SND_SOC_DAILINK_DEFS(ac97,
+       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(ac97_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 tosa_dai[] = {
 {
        .name = "AC97",
        .stream_name = "AC97 HiFi",
-       .cpu_dai_name = "pxa2xx-ac97",
-       .codec_dai_name = "wm9712-hifi",
-       .platform_name = "pxa-pcm-audio",
-       .codec_name = "wm9712-codec",
        .ops = &tosa_ops,
+       SND_SOC_DAILINK_REG(ac97),
 },
 {
        .name = "AC97 Aux",
        .stream_name = "AC97 Aux",
-       .cpu_dai_name = "pxa2xx-ac97-aux",
-       .codec_dai_name = "wm9712-aux",
-       .platform_name = "pxa-pcm-audio",
-       .codec_name = "wm9712-codec",
        .ops = &tosa_ops,
+       SND_SOC_DAILINK_REG(ac97_aux),
 },
 };