From: Masahiro Yamada <masahiroy@kernel.org>
Date: Tue, 18 Jun 2024 10:35:28 +0000 (+0900)
Subject: kconfig: use sym_get_choice_menu() in sym_check_choice_deps()
X-Git-Tag: v6.11-rc1~62^2~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=609fc4099b3482ba774712376d56316c561432ff;p=thirdparty%2Fkernel%2Flinux.git

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>
---

diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index 79f1b5e1cc9ea..22c15a1033711 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -1280,9 +1280,13 @@ out:
 		if (menu->sym)
 			menu->sym->flags &= ~SYMBOL_CHECK;
 
-	if (sym2 && sym_is_choice_value(sym2) &&
-	    prop_get_symbol(sym_get_choice_prop(sym2)) == choice)
-		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();