kconfig: change sym_choice_default() to take the choice menu

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

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 4359fbc..76193ce 100644 (file)
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -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;
                }

diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
index d820272..586a5e1 100644 (file)
--- a/scripts/kconfig/lkc.h
+++ b/scripts/kconfig/lkc.h
@@ -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);

diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index 344a241..3d68ab8 100644 (file)
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -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;
        }