Commit df60f4b9 authored by Ulf Magnusson's avatar Ulf Magnusson Committed by Masahiro Yamada
Browse files

kconfig: Remove menu_end_entry() 



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

	$ git log -G menu_end_entry --oneline
	a02f0570 [PATCH] kconfig: improve error handling in the parser
	1da177e4 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: default avatarUlf Magnusson <ulfalizer@gmail.com>
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent 0735f7e5

scripts/kconfig/lkc.h

+0 −1
Original line number Diff line number Diff line
@@ -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);

scripts/kconfig/menu.c

+0 −5
Original line number Diff line number Diff line
@@ -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;

}

scripts/kconfig/zconf.y

+1 −5
Original line number Diff line number Diff line
@@ -175,7 +175,6 @@ config_entry_start: T_CONFIG nonconst_symbol T_EOL 


config_stmt: config_entry_start config_option_list

{

	menu_end_entry();

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

};
@@ -192,7 +191,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());

};
@@ -421,9 +419,7 @@ comment: T_COMMENT prompt T_EOL 
};



comment_stmt: comment depends_list

{

	menu_end_entry();

};

;



/* help option */

CRA Git | Maintained and supported by SUSTech CRA and CCSE