kevin/linux
1
Fork 0
Code

kconfig: remove sym_get_choice_value()

Browse Source 
sym_get_choice_value(menu->sym) is equivalent to sym_calc_choice(menu).

Convert all call sites of sym_get_choice_value() and then remove it.

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

6
scripts/kconfig/conf.c
View File

@ -422,17 +422,15 @@ help:
static void conf_choice(struct menu *menu) static void conf_choice(struct menu *menu)
{ {
struct symbol *sym, *def_sym; struct symbol *def_sym;
struct menu *child; struct menu *child;
bool is_new = false; bool is_new = false;
sym = menu->sym;
while (1) { while (1) {
int cnt, def; int cnt, def;
printf("%*s%s\n", indent - 1, "", menu_get_prompt(menu)); printf("%*s%s\n", indent - 1, "", menu_get_prompt(menu));
def_sym = sym_get_choice_value(sym); def_sym = sym_calc_choice(menu);
cnt = def = 0; cnt = def = 0;
line[0] = 0; line[0] = 0;
for (child = menu->list; child; child = child->next) { for (child = menu->list; child; child = child->next) {

2
scripts/kconfig/gconf.c
View File

@ -1054,7 +1054,7 @@ static gchar **fill_row(struct menu *menu)
if (sym_is_choice(sym)) { // parse childs for getting final value if (sym_is_choice(sym)) { // parse childs for getting final value
struct menu *child; struct menu *child;
struct symbol *def_sym = sym_get_choice_value(sym); struct symbol *def_sym = sym_calc_choice(menu);
struct menu *def_menu = NULL; struct menu *def_menu = NULL;
for (child = menu->list; child; child = child->next) { for (child = menu->list; child; child = child->next) {

3
scripts/kconfig/lkc.h
View File

@ -110,6 +110,7 @@ void menu_get_ext_help(struct menu *menu, struct gstr *help);
/* symbol.c */ /* symbol.c */
void sym_clear_all_valid(void); void sym_clear_all_valid(void);
struct symbol *sym_choice_default(struct symbol *sym); struct symbol *sym_choice_default(struct symbol *sym);
struct symbol *sym_calc_choice(struct menu *choice);
struct property *sym_get_range_prop(struct symbol *sym); struct property *sym_get_range_prop(struct symbol *sym);
const char *sym_get_string_default(struct symbol *sym); const char *sym_get_string_default(struct symbol *sym);
struct symbol *sym_check_deps(struct symbol *sym); struct symbol *sym_check_deps(struct symbol *sym);
@ -120,8 +121,6 @@ static inline tristate sym_get_tristate_value(struct symbol *sym)
return sym->curr.tri; return sym->curr.tri;
} }
struct symbol *sym_get_choice_value(struct symbol *sym);
static inline bool sym_is_choice(struct symbol *sym) static inline bool sym_is_choice(struct symbol *sym)
{ {
/* A choice is a symbol with no name */ /* A choice is a symbol with no name */

6
scripts/kconfig/mconf.c
View File

@ -514,7 +514,7 @@ static void build_conf(struct menu *menu)
type = sym_get_type(sym); type = sym_get_type(sym);
if (sym_is_choice(sym)) { if (sym_is_choice(sym)) {
struct symbol *def_sym = sym_get_choice_value(sym); struct symbol *def_sym = sym_calc_choice(menu);
struct menu *def_menu = NULL; struct menu *def_menu = NULL;
child_count++; child_count++;
@ -600,7 +600,7 @@ static void conf_choice(struct menu *menu)
struct menu *child; struct menu *child;
struct symbol *active; struct symbol *active;
active = sym_get_choice_value(menu->sym); active = sym_calc_choice(menu);
while (1) { while (1) {
int res; int res;
int selected; int selected;
@ -619,7 +619,7 @@ static void conf_choice(struct menu *menu)
item_set_data(child); item_set_data(child);
if (child->sym == active) if (child->sym == active)
item_set_selected(1); item_set_selected(1);
if (child->sym == sym_get_choice_value(menu->sym)) if (child->sym == sym_calc_choice(menu))
item_set_tag('X'); item_set_tag('X');
} }
dialog_clear(); dialog_clear();

6
scripts/kconfig/nconf.c
View File

@ -815,7 +815,7 @@ static void build_conf(struct menu *menu)
type = sym_get_type(sym); type = sym_get_type(sym);
if (sym_is_choice(sym)) { if (sym_is_choice(sym)) {
struct symbol *def_sym = sym_get_choice_value(sym); struct symbol *def_sym = sym_calc_choice(menu);
struct menu *def_menu = NULL; struct menu *def_menu = NULL;
child_count++; child_count++;
@ -1239,7 +1239,7 @@ static void conf_choice(struct menu *menu)
.pattern = "", .pattern = "",
}; };
active = sym_get_choice_value(menu->sym); active = sym_calc_choice(menu);
/* this is mostly duplicated from the conf() function. */ /* this is mostly duplicated from the conf() function. */
while (!global_exit) { while (!global_exit) {
reset_menu(); reset_menu();
@ -1248,7 +1248,7 @@ static void conf_choice(struct menu *menu)
if (!show_all_items && !menu_is_visible(child)) if (!show_all_items && !menu_is_visible(child))
continue; continue;
if (child->sym == sym_get_choice_value(menu->sym)) if (child->sym == sym_calc_choice(menu))
item_make(child, ':', "<X> %s", item_make(child, ':', "<X> %s",
menu_get_prompt(child)); menu_get_prompt(child));
else if (child->sym) else if (child->sym)

9
scripts/kconfig/symbol.c
View File

@ -288,7 +288,7 @@ struct symbol *sym_choice_default(struct symbol *sym)
* *
* Return: a chosen symbol * Return: a chosen symbol
*/ */
static struct symbol *sym_calc_choice(struct menu *choice) struct symbol *sym_calc_choice(struct menu *choice)
{ {
struct symbol *res = NULL; struct symbol *res = NULL;
struct symbol *sym; struct symbol *sym;
@ -365,13 +365,6 @@ static struct symbol *sym_calc_choice(struct menu *choice)
return res; return res;
} }
struct symbol *sym_get_choice_value(struct symbol *sym)
{
struct menu *menu = list_first_entry(&sym->menus, struct menu, link);
return sym_calc_choice(menu);
}
static void sym_warn_unmet_dep(struct symbol *sym) static void sym_warn_unmet_dep(struct symbol *sym)
{ {
struct gstr gs = str_new(); struct gstr gs = str_new();