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 conf_write_defconfig()
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>
+5
-4
+5
-4
scripts/kconfig/confdata.c
+5
-4
scripts/kconfig/confdata.c
···
794
794
sym_clear_all_valid();
795
795
796
796
menu_for_each_entry(menu) {
797
+
struct menu *choice;
798
+
797
799
sym = menu->sym;
798
800
if (sym && !sym_is_choice(sym)) {
799
801
sym_calc_value(sym);
···
813
811
* If symbol is a choice value and equals to the
814
812
* default for a choice - skip.
815
813
*/
816
-
if (sym_is_choice_value(sym)) {
817
-
struct symbol *cs;
814
+
choice = sym_get_choice_menu(sym);
815
+
if (choice) {
818
816
struct symbol *ds;
819
817
820
-
cs = prop_get_symbol(sym_get_choice_prop(sym));
821
-
ds = sym_choice_default(cs);
818
+
ds = sym_choice_default(choice->sym);
822
819
if (sym == ds) {
823
820
if ((sym->type == S_BOOLEAN) &&
824
821
sym_get_tristate_value(sym) == yes)