tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

kconfig: use sym_get_choice_menu() in sym_check_deps()

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>

Masahiro Yamada b139b43e 609fc409

+4 -4
+4 -4
scripts/kconfig/symbol.c
··· 1295 1295 1296 1296 struct symbol *sym_check_deps(struct symbol *sym) 1297 1297 { 1298 + struct menu *choice; 1298 1299 struct symbol *sym2; 1299 - struct property *prop; 1300 1300 1301 1301 if (sym->flags & SYMBOL_CHECK) { 1302 1302 sym_check_print_recursive(sym); ··· 1305 1305 if (sym->flags & SYMBOL_CHECKED) 1306 1306 return NULL; 1307 1307 1308 - if (sym_is_choice_value(sym)) { 1308 + choice = sym_get_choice_menu(sym); 1309 + if (choice) { 1309 1310 struct dep_stack stack; 1310 1311 1311 1312 /* for choice groups start the check with main choice symbol */ 1312 1313 dep_stack_insert(&stack, sym); 1313 - prop = sym_get_choice_prop(sym); 1314 - sym2 = sym_check_deps(prop_get_symbol(prop)); 1314 + sym2 = sym_check_deps(choice->sym); 1315 1315 dep_stack_remove(); 1316 1316 } else if (sym_is_choice(sym)) { 1317 1317 sym2 = sym_check_choice_deps(sym);