summaryrefslogtreecommitdiffstats
path: root/sound/soc/tegra
diff options
context:
space:
mode:
authorKuninori Morimoto2019-06-19 03:18:31 +0200
committerMark Brown2019-06-19 13:55:52 +0200
commite7fc99e641da1f0da50328c98e7aa890b49d35d3 (patch)
tree26205fb7adbc44b5c3fcd4c8d2e54b14fca5c80b /sound/soc/tegra
parentASoC: sunxi: sun4i-codec: don't select unnecessary Platform (diff)
downloadkernel-qcow2-linux-e7fc99e641da1f0da50328c98e7aa890b49d35d3.tar.gz
kernel-qcow2-linux-e7fc99e641da1f0da50328c98e7aa890b49d35d3.tar.xz
kernel-qcow2-linux-e7fc99e641da1f0da50328c98e7aa890b49d35d3.zip
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 <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/tegra')
-rw-r--r--sound/soc/tegra/tegra_alc5632.c7
1 files changed, 1 insertions, 6 deletions
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;