On 6/24/25 8:04 AM, Masahiro Yamada wrote:
> The current menu_get_parent_menu() does not always return the parent
> menu; if the given argument is itself a menu, it returns that menu.
>
> Rename this function to better reflect this behavior.
>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org>
Thanks.
> ---
>
> scripts/kconfig/conf.c | 2 +-
> scripts/kconfig/lkc.h | 2 +-
> scripts/kconfig/menu.c | 8 +++++++-
> scripts/kconfig/qconf.cc | 6 +++---
> 4 files changed, 12 insertions(+), 6 deletions(-)
>
> diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
> index 8abe57041955..a7b44cd8ae14 100644
> --- a/scripts/kconfig/conf.c
> +++ b/scripts/kconfig/conf.c
> @@ -594,7 +594,7 @@ static void check_conf(struct menu *menu)
> default:
> if (!conf_cnt++)
> printf("*\n* Restart config...\n*\n");
> - rootEntry = menu_get_parent_menu(menu);
> + rootEntry = menu_get_menu_or_parent_menu(menu);
> conf(rootEntry);
> break;
> }
> diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
> index fbc907f75eac..5cc85c3d4aaa 100644
> --- a/scripts/kconfig/lkc.h
> +++ b/scripts/kconfig/lkc.h
> @@ -97,7 +97,7 @@ bool menu_is_empty(struct menu *menu);
> bool menu_is_visible(struct menu *menu);
> bool menu_has_prompt(const struct menu *menu);
> const char *menu_get_prompt(const struct menu *menu);
> -struct menu *menu_get_parent_menu(struct menu *menu);
> +struct menu *menu_get_menu_or_parent_menu(struct menu *menu);
> int get_jump_key_char(void);
> struct gstr get_relations_str(struct symbol **sym_arr, struct list_head *head);
> void menu_get_ext_help(struct menu *menu, struct gstr *help);
> diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
> index 7d48a692bd27..ccb690bbf05d 100644
> --- a/scripts/kconfig/menu.c
> +++ b/scripts/kconfig/menu.c
> @@ -575,7 +575,13 @@ const char *menu_get_prompt(const struct menu *menu)
> return NULL;
> }
>
> -struct menu *menu_get_parent_menu(struct menu *menu)
> +/**
> + * menu_get_menu_or_parent_menu - return the parent menu or the menu itself
> + * @menu: pointer to the menu
> + * return: the parent menu. If the given argument is already a menu, return
> + * itself.
> + */
> +struct menu *menu_get_menu_or_parent_menu(struct menu *menu)
> {
> enum prop_type type;
>
> diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
> index 68640e507ec4..dc056b0a8fde 100644
> --- a/scripts/kconfig/qconf.cc
> +++ b/scripts/kconfig/qconf.cc
> @@ -577,7 +577,7 @@ void ConfigList::setParentMenu(void)
> oldroot = rootEntry;
> if (rootEntry == &rootmenu)
> return;
> - setRootMenu(menu_get_parent_menu(rootEntry->parent));
> + setRootMenu(menu_get_menu_or_parent_menu(rootEntry->parent));
>
> QTreeWidgetItemIterator it(this);
> while (*it) {
> @@ -1540,7 +1540,7 @@ void ConfigMainWindow::setMenuLink(struct menu *menu)
> switch (configList->mode) {
> case singleMode:
> list = configList;
> - parent = menu_get_parent_menu(menu);
> + parent = menu_get_menu_or_parent_menu(menu);
> if (!parent)
> return;
> list->setRootMenu(parent);
> @@ -1551,7 +1551,7 @@ void ConfigMainWindow::setMenuLink(struct menu *menu)
> configList->clearSelection();
> list = configList;
> } else {
> - parent = menu_get_parent_menu(menu->parent);
> + parent = menu_get_menu_or_parent_menu(menu->parent);
> if (!parent)
> return;
>
--
~Randy