Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
kconfig: use sym_get_choice_menu() in sym_check_choice_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>
+7
-3
+7
-3
scripts/kconfig/symbol.c
+7
-3
scripts/kconfig/symbol.c
···
1280
1280
if (menu->sym)
1281
1281
menu->sym->flags &= ~SYMBOL_CHECK;
1282
1282
1283
-
if (sym2 && sym_is_choice_value(sym2) &&
1284
-
prop_get_symbol(sym_get_choice_prop(sym2)) == choice)
1285
-
sym2 = choice;
1283
+
if (sym2) {
1284
+
struct menu *choice_menu2;
1285
+
1286
+
choice_menu2 = sym_get_choice_menu(sym2);
1287
+
if (choice_menu2 == choice_menu)
1288
+
sym2 = choice;
1289
+
}
1286
1290
1287
1291
dep_stack_remove();
1288
1292