summaryrefslogtreecommitdiffstats
path: root/sound/soc/generic/simple-card-utils.c
diff options
context:
space:
mode:
authorKuninori Morimoto2018-08-31 05:11:25 +0200
committerMark Brown2018-08-31 16:59:02 +0200
commitc2f0898b86486a459fa8c91d194f3b699498c0c1 (patch)
tree2257d416ae93c11024877fdfe204e4ed060dac6a /sound/soc/generic/simple-card-utils.c
parentASoC: audio-graph-scu-card: support snd_soc_dai_link_component style for plat... (diff)
downloadkernel-qcow2-linux-c2f0898b86486a459fa8c91d194f3b699498c0c1.tar.gz
kernel-qcow2-linux-c2f0898b86486a459fa8c91d194f3b699498c0c1.tar.xz
kernel-qcow2-linux-c2f0898b86486a459fa8c91d194f3b699498c0c1.zip
ASoC: simple-card-util: remove dai_link compatible code for platform
Now no simple/audio cards are using legacy dai_link style for platform. Let's remove compatible code. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/generic/simple-card-utils.c')
-rw-r--r--sound/soc/generic/simple-card-utils.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
index 644cd62ba027..b400dbf1f834 100644
--- a/sound/soc/generic/simple-card-utils.c
+++ b/sound/soc/generic/simple-card-utils.c
@@ -376,13 +376,9 @@ EXPORT_SYMBOL_GPL(asoc_simple_card_init_dai);
int asoc_simple_card_canonicalize_dailink(struct snd_soc_dai_link *dai_link)
{
/* Assumes platform == cpu */
- if (dai_link->platform) {
- if (!dai_link->platform->of_node)
- dai_link->platform->of_node = dai_link->cpu_of_node;
- } else {
- if (!dai_link->platform_of_node)
- dai_link->platform_of_node = dai_link->cpu_of_node;
- }
+ if (!dai_link->platform->of_node)
+ dai_link->platform->of_node = dai_link->cpu_of_node;
+
return 0;
}