From: Masahiro Yamada <masahiroy@kernel.org>
Date: Sat, 10 Apr 2021 19:45:33 +0000 (+0900)
Subject: kconfig: nconf: remove unneeded default for menu prompt
X-Git-Tag: accepted/tizen/unified/20230118.172025~7333^2~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=16b0e10238b45251790ea1a2683855d4f8f3c1a3;p=platform%2Fkernel%2Flinux-rpi.git

kconfig: nconf: remove unneeded default for menu prompt

The rootmenu always has a prompt even if the 'mainmenu' statement is
missing in the top Kconfig file.

conf_parse() calls menu_add_prompt(P_MENU, "Main menu", NULL) in this
case.

So, every 'menu' has a prompt.

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

diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
index bcfcf0b..8187a2e 100644
--- a/scripts/kconfig/nconf.c
+++ b/scripts/kconfig/nconf.c
@@ -1066,7 +1066,6 @@ static int do_match(int key, struct match_state *state, int *ans)
 static void conf(struct menu *menu)
 {
 	struct menu *submenu = NULL;
-	const char *prompt = menu_get_prompt(menu);
 	struct symbol *sym;
 	int res;
 	int current_index = 0;
@@ -1084,9 +1083,8 @@ static void conf(struct menu *menu)
 		if (!child_count)
 			break;
 
-		show_menu(prompt ? prompt : "Main Menu",
-				menu_instructions,
-				current_index, &last_top_row);
+		show_menu(menu_get_prompt(menu), menu_instructions,
+			  current_index, &last_top_row);
 		keypad((menu_win(curses_menu)), TRUE);
 		while (!global_exit) {
 			if (match_state.in_search) {