]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
ASoC: tegra: tegra_rt5677: don't select unnecessary Platform
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Wed, 19 Jun 2019 01:18:44 +0000 (10:18 +0900)
committerMark Brown <broonie@kernel.org>
Wed, 19 Jun 2019 11:56:25 +0000 (12:56 +0100)
ALSA SoC is now supporting "no Platform". Sound card doesn't need to
select "CPU component" as "Platform" anymore if it doesn't need
special Platform.
This patch removes such settings.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/tegra/tegra_rt5677.c

index 7edf6c7838f5cff414c610612c5e09295a9380bb..db0ea38d3b082c012b2ab9b1940d8c9dbab65dff 100644 (file)
@@ -171,8 +171,7 @@ static int tegra_rt5677_asoc_init(struct snd_soc_pcm_runtime *rtd)
 
 SND_SOC_DAILINK_DEFS(pcm,
        DAILINK_COMP_ARRAY(COMP_EMPTY()),
-       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "rt5677-aif1")),
-       DAILINK_COMP_ARRAY(COMP_EMPTY()));
+       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "rt5677-aif1")));
 
 static struct snd_soc_dai_link tegra_rt5677_dai = {
        .name = "RT5677",
@@ -271,7 +270,6 @@ static int tegra_rt5677_probe(struct platform_device *pdev)
                ret = -EINVAL;
                goto err_put_codec_of_node;
        }
-       tegra_rt5677_dai.platforms->of_node = tegra_rt5677_dai.cpus->of_node;
 
        ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev);
        if (ret)
@@ -291,7 +289,6 @@ err_fini_utils:
 err_put_cpu_of_node:
        of_node_put(tegra_rt5677_dai.cpus->of_node);
        tegra_rt5677_dai.cpus->of_node = NULL;
-       tegra_rt5677_dai.platforms->of_node = NULL;
 err_put_codec_of_node:
        of_node_put(tegra_rt5677_dai.codecs->of_node);
        tegra_rt5677_dai.codecs->of_node = NULL;
@@ -308,7 +305,6 @@ static int tegra_rt5677_remove(struct platform_device *pdev)
 
        tegra_asoc_utils_fini(&machine->util_data);
 
-       tegra_rt5677_dai.platforms->of_node = NULL;
        of_node_put(tegra_rt5677_dai.codecs->of_node);
        tegra_rt5677_dai.codecs->of_node = NULL;
        of_node_put(tegra_rt5677_dai.cpus->of_node);