From: Kuninori Morimoto Date: Wed, 19 Jun 2019 01:18:31 +0000 (+0900) Subject: ASoC: tegra: tegra_alc5632: don't select unnecessary Platform X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e7fc99e641da1f0da50328c98e7aa890b49d35d3;p=openwrt%2Fstaging%2Fblogic.git ASoC: tegra: tegra_alc5632: don't select unnecessary Platform 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 Signed-off-by: Mark Brown --- diff --git a/sound/soc/tegra/tegra_alc5632.c b/sound/soc/tegra/tegra_alc5632.c index 5a63249ae812..2c1f1311278d 100644 --- a/sound/soc/tegra/tegra_alc5632.c +++ b/sound/soc/tegra/tegra_alc5632.c @@ -126,8 +126,7 @@ static int tegra_alc5632_asoc_init(struct snd_soc_pcm_runtime *rtd) SND_SOC_DAILINK_DEFS(pcm, DAILINK_COMP_ARRAY(COMP_EMPTY()), - DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "alc5632-hifi")), - DAILINK_COMP_ARRAY(COMP_EMPTY())); + DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "alc5632-hifi"))); static struct snd_soc_dai_link tegra_alc5632_dai = { .name = "ALC5632", @@ -198,8 +197,6 @@ static int tegra_alc5632_probe(struct platform_device *pdev) goto err_put_codec_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) goto err_put_cpu_of_node; @@ -218,7 +215,6 @@ err_fini_utils: err_put_cpu_of_node: 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.codecs->of_node); tegra_alc5632_dai.codecs->of_node = NULL; @@ -237,7 +233,6 @@ static int tegra_alc5632_remove(struct platform_device *pdev) 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;