aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/generic
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2019-06-19 10:19:31 +0900
committerMark Brown <broonie@kernel.org>2019-06-19 12:58:34 +0100
commit6f043744573520095bdee9e532d75574060e62f4 (patch)
tree730825387f87abbe4445e3600657021448b53487 /sound/soc/generic
parentASoC: ux500: mop500: don't select unnecessary Platform (diff)
downloadlinux-dev-6f043744573520095bdee9e532d75574060e62f4.tar.xz
linux-dev-6f043744573520095bdee9e532d75574060e62f4.zip
ASoC: simple-card-utils: 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/generic')
-rw-r--r--sound/soc/generic/simple-card-utils.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
index ac8678fe55ff..3cf5cb21ea52 100644
--- a/sound/soc/generic/simple-card-utils.c
+++ b/sound/soc/generic/simple-card-utils.c
@@ -346,9 +346,18 @@ EXPORT_SYMBOL_GPL(asoc_simple_dai_init);
void asoc_simple_canonicalize_platform(struct snd_soc_dai_link *dai_link)
{
- /* Assumes platform == cpu */
- if (!dai_link->platforms->of_node)
- dai_link->platforms->of_node = dai_link->cpus->of_node;
+ /*
+ * no Platform
+ *
+ * It will be waste of memory, but not be memory leak.
+ * see
+ * asoc_simple_init_priv()
+ * asoc_simple_priv
+ */
+ if (!dai_link->platforms->of_node) {
+ dai_link->platforms = NULL;
+ dai_link->num_platforms = 0;
+ }
}
EXPORT_SYMBOL_GPL(asoc_simple_canonicalize_platform);