superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

kconfig: m/nconf: remove dead code to display value of bool choice 

Previously, optional bool choices met the following conditions
simultaneously:

 - sym_is_choice(sym)
 - sym_is_changeable(sym)
 - type == S_BOOLEAN

It no longer occurs since 6a1215888e ("kconfig: remove 'optional'
property support"). Remove the dead code.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
pull/876/head
Masahiro Yamada 2024-05-10 19:23:22 +09:00
parent e89b46159c
commit cc3e4e5e38
2 changed files with 14 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/kconfig/mconf.c
View File

@ -525,19 +525,12 @@ static void build_conf(struct menu *menu)
val = sym_get_tristate_value(sym); val = sym_get_tristate_value(sym);
if (sym_is_changeable(sym)) { if (sym_is_changeable(sym)) {
switch (type) { switch (val) {
case S_BOOLEAN: case yes: ch = '*'; break;
item_make("[%c]", val == no ? ' ' : '*'); case mod: ch = 'M'; break;
break; default: ch = ' '; break;
case S_TRISTATE:
switch (val) {
case yes: ch = '*'; break;
case mod: ch = 'M'; break;
default: ch = ' '; break;
}
item_make("<%c>", ch);
break;
} }
item_make("<%c>", ch);
item_set_tag('t'); item_set_tag('t');
item_set_data(menu); item_set_data(menu);
} else { } else {

26
scripts/kconfig/nconf.c
View File

@ -826,26 +826,18 @@ static void build_conf(struct menu *menu)
val = sym_get_tristate_value(sym); val = sym_get_tristate_value(sym);
if (sym_is_changeable(sym)) { if (sym_is_changeable(sym)) {
switch (type) { switch (val) {
case S_BOOLEAN: case yes:
item_make(menu, 't', "[%c]", ch = '*';
val == no ? ' ' : '*');
break; break;
case S_TRISTATE: case mod:
switch (val) { ch = 'M';
case yes: break;
ch = '*'; default:
break; ch = ' ';
case mod:
ch = 'M';
break;
default:
ch = ' ';
break;
}
item_make(menu, 't', "<%c>", ch);
break; break;
} }
item_make(menu, 't', "<%c>", ch);
} else { } else {
item_make(menu, def_menu ? 't' : ':', " "); item_make(menu, def_menu ? 't' : ':', " ");
} }