mirror of
https://github.com/torvalds/linux
synced 2024-09-06 09:51:23 +00:00
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>
This commit is contained in:
parent
7bcf2e03b5
commit
fb8dd48214
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue