From: Masahiro Yamada <masahiroy@kernel.org>
Date: Sun, 21 Apr 2024 11:13:02 +0000 (+0900)
Subject: kconfig: remove unneeded if-conditional in conf_choice()
X-Git-Tag: v6.10-rc5-pxa1908~295^2~35
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=c2af3d03c51289629edaadf118445fd29933c456;p=linux.git

kconfig: remove unneeded if-conditional in conf_choice()

All symbols except choices have a name.

child->sym->name never becomes NULL inside choice blocks.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 965bb40c50e5..0156ca13f949 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -497,9 +497,8 @@ static int conf_choice(struct menu *menu)
 				printf("%*c", indent, '>');
 			} else
 				printf("%*c", indent, ' ');
-			printf(" %d. %s", cnt, menu_get_prompt(child));
-			if (child->sym->name)
-				printf(" (%s)", child->sym->name);
+			printf(" %d. %s (%s)", cnt, menu_get_prompt(child),
+			       child->sym->name);
 			if (!sym_has_value(child->sym))
 				printf(" (NEW)");
 			printf("\n");