[PATCH] kconfig: Remove menu_end_entry()

From: Ulf Magnusson
Date: Wed Oct 04 2017 - 22:37:04 EST

menu_end_entry() is empty and completely unused as far as I can tell:

$ git log -G menu_end_entry --oneline
a02f057 [PATCH] kconfig: improve error handling in the parser
1da177e Linux-2.6.12-rc2

Last one is the initial Git commit, where menu_end_entry() is empty as
well. I couldn't find anything that redefined it on Google either.

It might be a debugging helper for setting a breakpoint after each
config, menuconfig, and comment is parsed. IMO it hurts more than it
helps in that case by making the parsing code look more complicated at a
glance than it really is, and I suspect it doesn't get used much.

Tested by running the Kconfiglib test suite, which indirectly verifies
that the .config files generated by the C implementation for each
defconfig file in the kernel stays the same.

Signed-off-by: Ulf Magnusson <ulfalizer@xxxxxxxxx>
---
scripts/kconfig/lkc.h | 1 -
scripts/kconfig/menu.c | 5 -----
scripts/kconfig/zconf.tab.c_shipped | 30 ++++++++++--------------------
scripts/kconfig/zconf.y | 6 +-----
4 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
index cdcbe43..16cb62b 100644
--- a/scripts/kconfig/lkc.h
+++ b/scripts/kconfig/lkc.h
@@ -100,7 +100,6 @@ void menu_warn(struct menu *menu, const char *fmt, ...);
struct menu *menu_add_menu(void);
void menu_end_menu(void);
void menu_add_entry(struct symbol *sym);
-void menu_end_entry(void);
void menu_add_dep(struct expr *dep);
void menu_add_visibility(struct expr *dep);
struct property *menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep);
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index e935793..503f3ae 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -62,13 +62,8 @@ void menu_add_entry(struct symbol *sym)
menu_add_symbol(P_SYMBOL, sym, NULL);
}

-void menu_end_entry(void)
-{
-}
-
struct menu *menu_add_menu(void)
{
- menu_end_entry();
last_entry_ptr = &current_entry->list;
return current_menu = current_entry;
}
diff --git a/scripts/kconfig/zconf.tab.c_shipped b/scripts/kconfig/zconf.tab.c_shipped
index a22b285..7938548 100644
--- a/scripts/kconfig/zconf.tab.c_shipped
+++ b/scripts/kconfig/zconf.tab.c_shipped
@@ -516,16 +516,16 @@ static const yytype_uint16 yyrline[] =
0, 109, 109, 109, 111, 111, 113, 115, 116, 117,
118, 119, 120, 124, 128, 128, 128, 128, 128, 128,
128, 128, 128, 132, 133, 134, 135, 136, 137, 141,
- 142, 148, 156, 162, 170, 180, 182, 183, 184, 185,
- 186, 187, 190, 198, 204, 214, 220, 226, 232, 235,
- 237, 248, 249, 254, 263, 268, 276, 279, 281, 282,
- 283, 284, 285, 288, 294, 305, 311, 321, 323, 328,
- 336, 344, 347, 349, 350, 351, 356, 363, 370, 375,
- 383, 386, 388, 389, 390, 393, 401, 408, 415, 421,
- 428, 430, 431, 432, 435, 443, 445, 446, 449, 456,
- 458, 463, 464, 467, 468, 469, 473, 474, 477, 478,
- 481, 482, 483, 484, 485, 486, 487, 488, 489, 490,
- 491, 494, 495, 498, 499
+ 142, 148, 156, 161, 169, 178, 180, 181, 182, 183,
+ 184, 185, 188, 196, 202, 212, 218, 224, 230, 233,
+ 235, 246, 247, 252, 261, 266, 274, 277, 279, 280,
+ 281, 282, 283, 286, 292, 303, 309, 319, 321, 326,
+ 334, 342, 345, 347, 348, 349, 354, 361, 368, 373,
+ 381, 384, 386, 387, 388, 391, 399, 406, 411, 417,
+ 424, 426, 427, 428, 431, 439, 441, 442, 445, 452,
+ 454, 459, 460, 463, 464, 465, 469, 470, 473, 474,
+ 477, 478, 479, 480, 481, 482, 483, 484, 485, 486,
+ 487, 490, 491, 494, 495
};
#endif

@@ -1552,7 +1552,6 @@ yyreduce:
case 32:

{
- menu_end_entry();
printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(), zconf_lineno());
}

@@ -1576,7 +1575,6 @@ yyreduce:
current_entry->prompt->type = P_MENU;
else
zconfprint("warning: menuconfig statement without prompt");
- menu_end_entry();
printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(), zconf_lineno());
}

@@ -1821,14 +1819,6 @@ yyreduce:

break;

- case 87:
-
- {
- menu_end_entry();
-}
-
- break;
-
case 88:

{
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y
index c8f396c..3845aa9 100644
--- a/scripts/kconfig/zconf.y
+++ b/scripts/kconfig/zconf.y
@@ -155,7 +155,6 @@ config_entry_start: T_CONFIG T_WORD T_EOL

config_stmt: config_entry_start config_option_list
{
- menu_end_entry();
printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(), zconf_lineno());
};

@@ -173,7 +172,6 @@ menuconfig_stmt: menuconfig_entry_start config_option_list
current_entry->prompt->type = P_MENU;
else
zconfprint("warning: menuconfig statement without prompt");
- menu_end_entry();
printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(), zconf_lineno());
};

@@ -406,9 +404,7 @@ comment: T_COMMENT prompt T_EOL
};

comment_stmt: comment depends_list
-{
- menu_end_entry();
-};
+;

/* help option */

--
2.7.4