ASoC: pxa: hx4700: 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/hx4700.c b/sound/soc/pxa/hx4700.c
index 6cdef5d..5d86e61 100644 (file)
--- a/sound/soc/pxa/hx4700.c
+++ b/sound/soc/pxa/hx4700.c
@@ -139,17 +139,19 @@ static int hx4700_ak4641_init(struct snd_soc_pcm_runtime *rtd)
 }
 
 /* hx4700 digital audio interface glue - connects codec <--> CPU */
+SND_SOC_DAILINK_DEFS(ak4641,
+       DAILINK_COMP_ARRAY(COMP_CPU("pxa2xx-i2s")),
+       DAILINK_COMP_ARRAY(COMP_CODEC("ak4641.0-0012", "ak4641-hifi")),
+       DAILINK_COMP_ARRAY(COMP_PLATFORM("pxa-pcm-audio")));
+
 static struct snd_soc_dai_link hx4700_dai = {
        .name = "ak4641",
        .stream_name = "AK4641",
-       .cpu_dai_name = "pxa2xx-i2s",
-       .codec_dai_name = "ak4641-hifi",
-       .platform_name = "pxa-pcm-audio",
-       .codec_name = "ak4641.0-0012",
        .init = hx4700_ak4641_init,
        .dai_fmt = SND_SOC_DAIFMT_MSB | SND_SOC_DAIFMT_NB_NF |
                   SND_SOC_DAIFMT_CBS_CFS,
        .ops = &hx4700_ops,
+       SND_SOC_DAILINK_REG(ak4641),
 };
 
 /* hx4700 audio machine driver */