kevin/linux
1
Fork 0
Code

kconfig: change sym_choice_default() to take the choice menu

Browse Source 
Change the argument of sym_choice_default() to ease further cleanups.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
This commit is contained in:
Masahiro Yamada 2024-06-18 19:35:24 +09:00
parent cca318378d
commit e8fcd915e3
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/kconfig/confdata.c
View File

@ -779,7 +779,7 @@ int conf_write_defconfig(const char *filename)
if (choice) {
struct symbol *ds;
ds = sym_choice_default(choice->sym);
ds = sym_choice_default(choice);
if (sym == ds && sym_get_tristate_value(sym) == yes)
continue;
}

2
scripts/kconfig/lkc.h
View File

@ -109,7 +109,7 @@ void menu_get_ext_help(struct menu *menu, struct gstr *help);
/* symbol.c */
void sym_clear_all_valid(void);
struct symbol *sym_choice_default(struct symbol *sym);
struct symbol *sym_choice_default(struct menu *choice);
struct symbol *sym_calc_choice(struct menu *choice);
struct property *sym_get_range_prop(struct symbol *sym);
const char *sym_get_string_default(struct symbol *sym);

8
scripts/kconfig/symbol.c
View File

@ -255,14 +255,14 @@ static void sym_calc_visibility(struct symbol *sym)
* Next locate the first visible choice value
* Return NULL if none was found
*/
struct symbol *sym_choice_default(struct symbol *sym)
struct symbol *sym_choice_default(struct menu *choice)
{
struct symbol *def_sym;
struct property *prop;
struct expr *e;
/* any of the defaults visible? */
for_all_defaults(sym, prop) {
for_all_defaults(choice->sym, prop) {
prop->visible.tri = expr_calc_value(prop->visible.expr);
if (prop->visible.tri == no)
continue;
@ -272,7 +272,7 @@ struct symbol *sym_choice_default(struct symbol *sym)
}
/* just get the first visible value */
prop = sym_get_choice_prop(sym);
prop = sym_get_choice_prop(choice->sym);
expr_list_for_each_sym(prop->expr, e, def_sym)
if (def_sym->visible != no)
return def_sym;
@ -312,7 +312,7 @@ struct symbol *sym_calc_choice(struct menu *choice)
* explicitly set to 'n'.
*/
if (!res) {
res = sym_choice_default(choice->sym);
res = sym_choice_default(choice);
if (res && sym_has_value(res) && res->def[S_DEF_USER].tri == no)
res = NULL;
}