From fdd67ea2c4eb42d6253ff8b1509fbea07961354f Mon Sep 17 00:00:00 2001 From: Hin-Tak Leung Date: Fri, 16 Apr 2021 18:14:01 +0100 Subject: [PATCH] Move call to asoc_simple_canonicalize_platform() later to match upstream - likely does not matter. commit fe7ed4dec2e6289eab81dd18c0d613c0851d85a1 Author: Kuninori Morimoto Date: Mon Jan 21 16:40:59 2019 +0900 ASoC: simple-card: rename to asoc_simple_card_canonicalize_platform() Current simple-card is using asoc_simple_card_canonicalize_dailink(). Its naming is "dailink", but is for "platform". We already have asoc_simple_card_canonicalize_cpu() for "cpu", let's follow same naming rule. It never return error, so, void function is better idea. Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- seeed-voicecard.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/seeed-voicecard.c b/seeed-voicecard.c index 6fcdc22..0a413d9 100644 --- a/seeed-voicecard.c +++ b/seeed-voicecard.c @@ -506,10 +506,6 @@ static int seeed_voice_card_dai_link_of(struct device_node *node, if (ret < 0) goto dai_link_of_err; - #if _SINGLE_CODEC - asoc_simple_canonicalize_platform(dai_link); - #endif - ret = asoc_simple_set_dailink_name(dev, dai_link, "%s-%s", dai_link->cpus->dai_name, @@ -539,6 +535,9 @@ static int seeed_voice_card_dai_link_of(struct device_node *node, dai_props->codec_dai.sysclk); asoc_simple_canonicalize_cpu(dai_link, single_cpu); + #if _SINGLE_CODEC + asoc_simple_canonicalize_platform(dai_link); + #endif dai_link_of_err: of_node_put(cpu);