kevin/linux
1
Fork 0
Code

kconfig: use sym_get_choice_menu() in sym_check_deps()

Browse Source 
Choices and their members are associated via the P_CHOICE property.

Currently, prop_get_symbol(sym_get_choice_prop()) is used to obtain
the choice of the given choice member.

Replace it with sym_get_choice_menu(), which retrieves the choice
without relying on P_CHOICE.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
This commit is contained in:
Masahiro Yamada 2024-06-18 19:35:29 +09:00
parent 609fc4099b
commit b139b43e9d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/kconfig/symbol.c
View File

@ -1295,8 +1295,8 @@ out:
struct symbol *sym_check_deps(struct symbol *sym) struct symbol *sym_check_deps(struct symbol *sym)
{ {
struct menu *choice;
struct symbol *sym2; struct symbol *sym2;
struct property *prop;
if (sym->flags & SYMBOL_CHECK) { if (sym->flags & SYMBOL_CHECK) {
sym_check_print_recursive(sym); sym_check_print_recursive(sym);
@ -1305,13 +1305,13 @@ struct symbol *sym_check_deps(struct symbol *sym)
if (sym->flags & SYMBOL_CHECKED) if (sym->flags & SYMBOL_CHECKED)
return NULL; return NULL;
if (sym_is_choice_value(sym)) { choice = sym_get_choice_menu(sym);
if (choice) {
struct dep_stack stack; struct dep_stack stack;
/* for choice groups start the check with main choice symbol */ /* for choice groups start the check with main choice symbol */
dep_stack_insert(&stack, sym); dep_stack_insert(&stack, sym);
prop = sym_get_choice_prop(sym); sym2 = sym_check_deps(choice->sym);
sym2 = sym_check_deps(prop_get_symbol(prop));
dep_stack_remove(); dep_stack_remove();
} else if (sym_is_choice(sym)) { } else if (sym_is_choice(sym)) {
sym2 = sym_check_choice_deps(sym); sym2 = sym_check_choice_deps(sym);