ASoC: sirf: sirf-audio: 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/sirf/sirf-audio.c b/sound/soc/sirf/sirf-audio.c
index f2bc50790f763cbfe537ea7316e072102c401d0f..ba85ccf1fe19443b26a263897d0bab5184b42b49 100644 (file)
--- a/sound/soc/sirf/sirf-audio.c
+++ b/sound/soc/sirf/sirf-audio.c
@@ -61,11 +61,16 @@ static const struct snd_soc_dapm_route intercon[] = {
 };
 
 /* Digital audio interface glue - connects codec <--> CPU */
+SND_SOC_DAILINK_DEFS(sirf,
+       DAILINK_COMP_ARRAY(COMP_EMPTY()),
+       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "sirf-audio-codec")),
+       DAILINK_COMP_ARRAY(COMP_EMPTY()));
+
 static struct snd_soc_dai_link sirf_audio_dai_link[] = {
        {
                .name = "SiRF audio card",
                .stream_name = "SiRF audio HiFi",
-               .codec_dai_name = "sirf-audio-codec",
+               SND_SOC_DAILINK_REG(sirf),
        },
 };
 
@@ -92,11 +97,11 @@ static int sirf_audio_probe(struct platform_device *pdev)
        if (sirf_audio_card == NULL)
                return -ENOMEM;
 
-       sirf_audio_dai_link[0].cpu_of_node =
+       sirf_audio_dai_link[0].cpus->of_node =
                of_parse_phandle(pdev->dev.of_node, "sirf,audio-platform", 0);
-       sirf_audio_dai_link[0].platform_of_node =
+       sirf_audio_dai_link[0].platforms->of_node =
                of_parse_phandle(pdev->dev.of_node, "sirf,audio-platform", 0);
-       sirf_audio_dai_link[0].codec_of_node =
+       sirf_audio_dai_link[0].codecs->of_node =
                of_parse_phandle(pdev->dev.of_node, "sirf,audio-codec", 0);
        sirf_audio_card->gpio_spk_pa = of_get_named_gpio(pdev->dev.of_node,
                        "spk-pa-gpios", 0);