From c2f0898b86486a459fa8c91d194f3b699498c0c1 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Fri, 31 Aug 2018 03:11:25 +0000 Subject: [PATCH] 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 Signed-off-by: Mark Brown --- sound/soc/generic/simple-card-utils.c | 10 +++------- 1 file 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; } -- 2.25.1