ASoC: tegra: tegra_alc5632: 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/tegra/tegra_alc5632.c b/sound/soc/tegra/tegra_alc5632.c
index 98d8780..5a63249 100644 (file)
--- a/sound/soc/tegra/tegra_alc5632.c
+++ b/sound/soc/tegra/tegra_alc5632.c
@@ -124,15 +124,20 @@ static int tegra_alc5632_asoc_init(struct snd_soc_pcm_runtime *rtd)
        return 0;
 }
 
+SND_SOC_DAILINK_DEFS(pcm,
+       DAILINK_COMP_ARRAY(COMP_EMPTY()),
+       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "alc5632-hifi")),
+       DAILINK_COMP_ARRAY(COMP_EMPTY()));
+
 static struct snd_soc_dai_link tegra_alc5632_dai = {
        .name = "ALC5632",
        .stream_name = "ALC5632 PCM",
-       .codec_dai_name = "alc5632-hifi",
        .init = tegra_alc5632_asoc_init,
        .ops = &tegra_alc5632_asoc_ops,
        .dai_fmt = SND_SOC_DAIFMT_I2S
                           | SND_SOC_DAIFMT_NB_NF
                           | SND_SOC_DAIFMT_CBS_CFS,
+       SND_SOC_DAILINK_REG(pcm),
 };
 
 static struct snd_soc_card snd_soc_tegra_alc5632 = {
@@ -174,26 +179,26 @@ static int tegra_alc5632_probe(struct platform_device *pdev)
        if (ret)
                goto err;
 
-       tegra_alc5632_dai.codec_of_node = of_parse_phandle(
+       tegra_alc5632_dai.codecs->of_node = of_parse_phandle(
                        pdev->dev.of_node, "nvidia,audio-codec", 0);
 
-       if (!tegra_alc5632_dai.codec_of_node) {
+       if (!tegra_alc5632_dai.codecs->of_node) {
                dev_err(&pdev->dev,
                        "Property 'nvidia,audio-codec' missing or invalid\n");
                ret = -EINVAL;
                goto err;
        }
 
-       tegra_alc5632_dai.cpu_of_node = of_parse_phandle(np,
+       tegra_alc5632_dai.cpus->of_node = of_parse_phandle(np,
                        "nvidia,i2s-controller", 0);
-       if (!tegra_alc5632_dai.cpu_of_node) {
+       if (!tegra_alc5632_dai.cpus->of_node) {
                dev_err(&pdev->dev,
                        "Property 'nvidia,i2s-controller' missing or invalid\n");
                ret = -EINVAL;
                goto err_put_codec_of_node;
        }
 
-       tegra_alc5632_dai.platform_of_node = tegra_alc5632_dai.cpu_of_node;
+       tegra_alc5632_dai.platforms->of_node = tegra_alc5632_dai.cpus->of_node;
 
        ret = tegra_asoc_utils_init(&alc5632->util_data, &pdev->dev);
        if (ret)
@@ -211,12 +216,12 @@ static int tegra_alc5632_probe(struct platform_device *pdev)
 err_fini_utils:
        tegra_asoc_utils_fini(&alc5632->util_data);
 err_put_cpu_of_node:
-       of_node_put(tegra_alc5632_dai.cpu_of_node);
-       tegra_alc5632_dai.cpu_of_node = NULL;
-       tegra_alc5632_dai.platform_of_node = NULL;
+       of_node_put(tegra_alc5632_dai.cpus->of_node);
+       tegra_alc5632_dai.cpus->of_node = NULL;
+       tegra_alc5632_dai.platforms->of_node = NULL;
 err_put_codec_of_node:
-       of_node_put(tegra_alc5632_dai.codec_of_node);
-       tegra_alc5632_dai.codec_of_node = NULL;
+       of_node_put(tegra_alc5632_dai.codecs->of_node);
+       tegra_alc5632_dai.codecs->of_node = NULL;
 err:
        return ret;
 }
@@ -230,11 +235,11 @@ static int tegra_alc5632_remove(struct platform_device *pdev)
 
        tegra_asoc_utils_fini(&machine->util_data);
 
-       of_node_put(tegra_alc5632_dai.cpu_of_node);
-       tegra_alc5632_dai.cpu_of_node = NULL;
-       tegra_alc5632_dai.platform_of_node = NULL;
-       of_node_put(tegra_alc5632_dai.codec_of_node);
-       tegra_alc5632_dai.codec_of_node = NULL;
+       of_node_put(tegra_alc5632_dai.cpus->of_node);
+       tegra_alc5632_dai.cpus->of_node = NULL;
+       tegra_alc5632_dai.platforms->of_node = NULL;
+       of_node_put(tegra_alc5632_dai.codecs->of_node);
+       tegra_alc5632_dai.codecs->of_node = NULL;
 
        return 0;
 }