Commit 609fc409 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

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: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent d8f8bbcf

scripts/kconfig/symbol.c

+7 −3
Original line number Diff line number Diff line
@@ -1280,9 +1280,13 @@ static struct symbol *sym_check_choice_deps(struct symbol *choice) 
		if (menu->sym)

			menu->sym->flags &= ~SYMBOL_CHECK;



	if (sym2 && sym_is_choice_value(sym2) &&

	    prop_get_symbol(sym_get_choice_prop(sym2)) == choice)

	if (sym2) {

		struct menu *choice_menu2;



		choice_menu2 = sym_get_choice_menu(sym2);

		if (choice_menu2 == choice_menu)

			sym2 = choice;

	}



	dep_stack_remove();