From b9272dcee8bdf87e86bf6f776464ad1472bef771 Mon Sep 17 00:00:00 2001 From: Hin-Tak Leung Date: Fri, 24 Apr 2020 03:50:41 +0100 Subject: [PATCH] asoc_simple_card_canonicalize_platform returns void, and always successful In v5.1: 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. --- seeed-voicecard.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/seeed-voicecard.c b/seeed-voicecard.c index 4b6b337..6391d2e 100644 --- a/seeed-voicecard.c +++ b/seeed-voicecard.c @@ -378,9 +378,7 @@ static int seeed_voice_card_dai_link_of(struct device_node *node, goto dai_link_of_err; #if _SINGLE_CODEC - ret = asoc_simple_canonicalize_platform(dai_link); - if (ret < 0) - goto dai_link_of_err; + asoc_simple_canonicalize_platform(dai_link); #endif ret = asoc_simple_set_dailink_name(dev, dai_link,