From 6f043744573520095bdee9e532d75574060e62f4 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Wed, 19 Jun 2019 10:19:31 +0900 Subject: [PATCH] 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 Signed-off-by: Mark Brown --- sound/soc/generic/simple-card-utils.c | 15 ++++++++++++--- 1 file 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);