system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-06 09:51:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

kconfig: use sym_get_choice_menu() in conf_write_defconfig()

Browse source 
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>
This commit is contained in:
Masahiro Yamada 2024-05-05 03:33:29 +09:00
parent 7bcf2e03b5
commit fb8dd48214
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
scripts/kconfig/confdata.c
View file

@ -794,6 +794,8 @@ int conf_write_defconfig(const char *filename)
sym_clear_all_valid();
menu_for_each_entry(menu) {
struct menu *choice;
sym = menu->sym;
if (sym && !sym_is_choice(sym)) {
sym_calc_value(sym);
@ -811,12 +813,11 @@ int conf_write_defconfig(const char *filename)
* If symbol is a choice value and equals to the
* default for a choice - skip.
*/
if (sym_is_choice_value(sym)) {
struct symbol *cs;
choice = sym_get_choice_menu(sym);
if (choice) {
struct symbol *ds;
cs = prop_get_symbol(sym_get_choice_prop(sym));
ds = sym_choice_default(cs);
ds = sym_choice_default(choice->sym);
if (sym == ds) {
if ((sym->type == S_BOOLEAN) &&
sym_get_tristate_value(sym) == yes)