]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ASoC: txx9: txx9aclc-generic: use modern dai_link style
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Thu, 6 Jun 2019 04:18:25 +0000 (13:18 +0900)
committerMark Brown <broonie@kernel.org>
Thu, 6 Jun 2019 21:07:55 +0000 (22:07 +0100)
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>
sound/soc/txx9/txx9aclc-generic.c

index d0b1e7759968bb01165af940ec9f8d3d1b88580b..c5aaad1582807d0dc3c9a0f1c5383e671bf65146 100644 (file)
 #include <sound/soc.h>
 #include "txx9aclc.h"
 
+SND_SOC_DAILINK_DEFS(hifi,
+       DAILINK_COMP_ARRAY(COMP_CPU("txx9aclc-ac97")),
+       DAILINK_COMP_ARRAY(COMP_CODEC("ac97-codec", "ac97-hifi")),
+       DAILINK_COMP_ARRAY(COMP_PLATFORM("txx9aclc-pcm-audio")));
+
 static struct snd_soc_dai_link txx9aclc_generic_dai = {
        .name = "AC97",
        .stream_name = "AC97 HiFi",
-       .cpu_dai_name = "txx9aclc-ac97",
-       .codec_dai_name = "ac97-hifi",
-       .platform_name  = "txx9aclc-pcm-audio",
-       .codec_name     = "ac97-codec",
+       SND_SOC_DAILINK_REG(hifi),
 };
 
 static struct snd_soc_card txx9aclc_generic_card = {