ASoC: sh: sh7760-ac97: use modern dai_link style
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Thu, 6 Jun 2019 04:13:24 +0000 (13:13 +0900)
committerMark Brown <broonie@kernel.org>
Thu, 6 Jun 2019 20:37:35 +0000 (21:37 +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/sh/sh7760-ac97.c

index 4bb4c13cf86086b2b6d759287a7bc6f426f0e60d..d267243a159ba68018ea862aaf896a3f981e40f7 100644 (file)
 
 #define IPSEL 0xFE400034
 
+SND_SOC_DAILINK_DEFS(ac97,
+       DAILINK_COMP_ARRAY(COMP_CPU("hac-dai.0")),      /* HAC0 */
+       DAILINK_COMP_ARRAY(COMP_CODEC("ac97-codec", "ac97-hifi")),
+       DAILINK_COMP_ARRAY(COMP_PLATFORM("sh7760-pcm-audio")));
+
 static struct snd_soc_dai_link sh7760_ac97_dai = {
        .name = "AC97",
        .stream_name = "AC97 HiFi",
-       .cpu_dai_name = "hac-dai.0",    /* HAC0 */
-       .codec_dai_name = "ac97-hifi",
-       .platform_name = "sh7760-pcm-audio",
-       .codec_name = "ac97-codec",
-       .ops = NULL,
+       SND_SOC_DAILINK_REG(ac97),
 };
 
 static struct snd_soc_card sh7760_ac97_soc_machine  = {