Commit 092e39d1 authored by Masahiro Yamada's avatar Masahiro Yamada

kconfig: squash menu_has_help() and menu_get_help()

menu_has_help() and menu_get_help() functions are only used within
menu_get_ext_help().

Squash them into menu_get_ext_help(). It revealed the if-conditional
in menu_get_help() was unneeded, as menu_has_help() has already checked
that menu->help is not NULL.
Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent 6c07fd84
...@@ -99,8 +99,6 @@ bool menu_is_visible(struct menu *menu); ...@@ -99,8 +99,6 @@ bool menu_is_visible(struct menu *menu);
bool menu_has_prompt(struct menu *menu); bool menu_has_prompt(struct menu *menu);
const char *menu_get_prompt(struct menu *menu); const char *menu_get_prompt(struct menu *menu);
struct menu *menu_get_parent_menu(struct menu *menu); struct menu *menu_get_parent_menu(struct menu *menu);
bool menu_has_help(struct menu *menu);
const char *menu_get_help(struct menu *menu);
int get_jump_key_char(void); int get_jump_key_char(void);
struct gstr get_relations_str(struct symbol **sym_arr, struct list_head *head); struct gstr get_relations_str(struct symbol **sym_arr, struct list_head *head);
void menu_get_ext_help(struct menu *menu, struct gstr *help); void menu_get_ext_help(struct menu *menu, struct gstr *help);
......
...@@ -673,19 +673,6 @@ struct menu *menu_get_parent_menu(struct menu *menu) ...@@ -673,19 +673,6 @@ struct menu *menu_get_parent_menu(struct menu *menu)
return menu; return menu;
} }
bool menu_has_help(struct menu *menu)
{
return menu->help != NULL;
}
const char *menu_get_help(struct menu *menu)
{
if (menu->help)
return menu->help;
else
return "";
}
static void get_def_str(struct gstr *r, struct menu *menu) static void get_def_str(struct gstr *r, struct menu *menu)
{ {
str_printf(r, "Defined at %s:%d\n", str_printf(r, "Defined at %s:%d\n",
...@@ -856,10 +843,10 @@ void menu_get_ext_help(struct menu *menu, struct gstr *help) ...@@ -856,10 +843,10 @@ void menu_get_ext_help(struct menu *menu, struct gstr *help)
struct symbol *sym = menu->sym; struct symbol *sym = menu->sym;
const char *help_text = nohelp_text; const char *help_text = nohelp_text;
if (menu_has_help(menu)) { if (menu->help) {
if (sym->name) if (sym->name)
str_printf(help, "%s%s:\n\n", CONFIG_, sym->name); str_printf(help, "%s%s:\n\n", CONFIG_, sym->name);
help_text = menu_get_help(menu); help_text = menu->help;
} }
str_printf(help, "%s\n", help_text); str_printf(help, "%s\n", help_text);
if (sym) if (sym)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment