[PATCH] kconfig: trivial cleanup

Replace all menu_add_prop mimicking menu_add_prompt with the latter func. I've
had to add a return value to menu_add_prompt for one usage.

I've rebuilt scripts/kconfig/zconf.tab.c_shipped by hand to reflect changes
in the source (I've not the same Bison version so regenerating it wouldn't
have been not a good idea), and compared it with what Roman itself did some
time ago, and it's the same.

So I guess this can be finally merged.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y
index 54460f8d3696..e1a0f455d4a8 100644
--- a/scripts/kconfig/zconf.y
+++ b/scripts/kconfig/zconf.y
@@ -342,7 +342,7 @@ if_block:
 menu: T_MENU prompt T_EOL
 {
         menu_add_entry(NULL);
-        menu_add_prop(P_MENU, $2, NULL, NULL);
+        menu_add_prompt(P_MENU, $2, NULL);
         printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno());
 };
 
@@ -392,7 +392,7 @@ source_stmt: source
 comment: T_COMMENT prompt T_EOL
 {
         menu_add_entry(NULL);
-        menu_add_prop(P_COMMENT, $2, NULL, NULL);
+        menu_add_prompt(P_COMMENT, $2, NULL);
         printd(DEBUG_PARSE, "%s:%d:comment\n", zconf_curname(), zconf_lineno());
 };
 
@@ -443,7 +443,7 @@ prompt_stmt_opt:
           /* empty */
         | prompt if_expr
 {
-        menu_add_prop(P_PROMPT, $1, NULL, $2);
+        menu_add_prompt(P_PROMPT, $1, $2);
 };
 
 prompt:   T_WORD
@@ -487,7 +487,7 @@ void conf_parse(const char *name)
         sym_init();
         menu_init();
         modules_sym = sym_lookup("MODULES", 0);
-        rootmenu.prompt = menu_add_prop(P_MENU, "Linux Kernel Configuration", NULL, NULL);
+        rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL);
 
         //zconfdebug = 1;
         zconfparse();