From: Masahiro Yamada <masahiroy@kernel.org>
To: linux-kbuild@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Masahiro Yamada <masahiroy@kernel.org>
Subject: [PATCH v2 10/12] kconfig: use sym_get_choice_menu() in sym_check_deps()
Date: Tue, 18 Jun 2024 19:35:29 +0900 [thread overview]
Message-ID: <20240618103541.3508486-11-masahiroy@kernel.org> (raw)
In-Reply-To: <20240618103541.3508486-1-masahiroy@kernel.org>
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>
---
(no changes since v1)
scripts/kconfig/symbol.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index 22c15a103371..b50911bcb08d 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -1295,8 +1295,8 @@ static struct symbol *sym_check_choice_deps(struct symbol *choice)
struct symbol *sym_check_deps(struct symbol *sym)
{
+ struct menu *choice;
struct symbol *sym2;
- struct property *prop;
if (sym->flags & SYMBOL_CHECK) {
sym_check_print_recursive(sym);
@@ -1305,13 +1305,13 @@ struct symbol *sym_check_deps(struct symbol *sym)
if (sym->flags & SYMBOL_CHECKED)
return NULL;
- if (sym_is_choice_value(sym)) {
+ choice = sym_get_choice_menu(sym);
+ if (choice) {
struct dep_stack stack;
/* for choice groups start the check with main choice symbol */
dep_stack_insert(&stack, sym);
- prop = sym_get_choice_prop(sym);
- sym2 = sym_check_deps(prop_get_symbol(prop));
+ sym2 = sym_check_deps(choice->sym);
dep_stack_remove();
} else if (sym_is_choice(sym)) {
sym2 = sym_check_choice_deps(sym);
--
2.43.0
next prev parent reply other threads:[~2024-06-18 10:36 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-18 10:35 [PATCH v2 00/12] kconfig: fix choice value calculation with misc cleanups Masahiro Yamada
2024-06-18 10:35 ` [PATCH v2 01/12] kconfig: import list_move(_tail) and list_for_each_entry_reverse macros Masahiro Yamada
2024-06-18 10:35 ` [PATCH v2 02/12] kconfig: refactor choice value calculation Masahiro Yamada
2024-08-31 17:30 ` Niklas Söderlund
2024-09-01 9:10 ` Masahiro Yamada
2024-09-01 9:32 ` Niklas Söderlund
2024-06-18 10:35 ` [PATCH v2 03/12] kconfig: remove sym_get_choice_value() Masahiro Yamada
2024-06-18 10:35 ` [PATCH v2 04/12] kconfig: remove conf_unsaved in conf_read_simple() Masahiro Yamada
2024-06-18 10:35 ` [PATCH v2 05/12] kconfig: change sym_choice_default() to take the choice menu Masahiro Yamada
2024-06-18 10:35 ` [PATCH v2 06/12] kconfig: use menu_list_for_each_sym() in sym_choice_default() Masahiro Yamada
2024-06-18 10:35 ` [PATCH v2 07/12] kconfig: remove expr_list_for_each_sym() macro Masahiro Yamada
2024-06-18 10:35 ` [PATCH v2 08/12] kconfig: use sym_get_choice_menu() in sym_check_print_recursive() Masahiro Yamada
2024-06-18 10:35 ` [PATCH v2 09/12] kconfig: use sym_get_choice_menu() in sym_check_choice_deps() Masahiro Yamada
2024-06-18 10:35 ` Masahiro Yamada [this message]
2024-06-18 10:35 ` [PATCH v2 11/12] kconfig: remove P_CHOICE property Masahiro Yamada
2024-06-18 10:35 ` [PATCH v2 12/12] kconfig: remove E_LIST expression type Masahiro Yamada
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240618103541.3508486-11-masahiroy@kernel.org \
--to=masahiroy@kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox