From: Masahiro Yamada <masahiroy@kernel.org>
Date: Sun, 10 Mar 2024 14:16:17 +0000 (+0900)
Subject: kconfig: remove unneeded menu_is_visible() call in conf_write_defconfig()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b27a91383abc4acca39f4402cdcc74ce4a476d8e;p=linux.git

kconfig: remove unneeded menu_is_visible() call in conf_write_defconfig()

When the condition 'sym == NULL' is met, the code will reach the
'next_menu' label regardless of the return value from menu_is_visible().

menu_is_visible() calculates some symbol values as a side-effect, for
instance by calling expr_calc_value(menu->visibility), but all the
symbol values will be calculated eventually.

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

diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index c5b6487d68ac4..0e35c4819cf1d 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -799,10 +799,7 @@ int conf_write_defconfig(const char *filename)
 	while (menu != NULL)
 	{
 		sym = menu->sym;
-		if (sym == NULL) {
-			if (!menu_is_visible(menu))
-				goto next_menu;
-		} else if (!sym_is_choice(sym)) {
+		if (sym && !sym_is_choice(sym)) {
 			sym_calc_value(sym);
 			if (!(sym->flags & SYMBOL_WRITE))
 				goto next_menu;