openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

kconfig: drop 'boolean' keyword 

No more users of this keyword.  Drop it according to the notice by
commit 6341e62b21 ("kconfig: use bool instead of boolean for type
definition attributes").

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Luis R. Rodriguez <mcgrof@kernel.org>
This commit is contained in:
Masahiro Yamada 2017-12-16 00:38:02 +09:00
parent 1ae83c5c97
commit b92d804a51
6 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/kconfig/confdata.c
View File

@ -1123,7 +1123,7 @@ void set_all_choice_values(struct symbol *csym)
bool conf_set_all_new_symbols(enum conf_def_mode mode) bool conf_set_all_new_symbols(enum conf_def_mode mode)
{ {
struct symbol *sym, *csym; struct symbol *sym, *csym;
int i, cnt, pby, pty, ptm; /* pby: probability of boolean = y int i, cnt, pby, pty, ptm; /* pby: probability of bool = y
* pty: probability of tristate = y * pty: probability of tristate = y
* ptm: probability of tristate = m * ptm: probability of tristate = m
*/ */

1
scripts/kconfig/kconf_id.c
View File

@ -20,7 +20,6 @@ static struct kconf_id kconf_id_array[] = {
{ "tristate", T_TYPE, TF_COMMAND, S_TRISTATE }, { "tristate", T_TYPE, TF_COMMAND, S_TRISTATE },
{ "def_tristate", T_DEFAULT, TF_COMMAND, S_TRISTATE }, { "def_tristate", T_DEFAULT, TF_COMMAND, S_TRISTATE },
{ "bool", T_TYPE, TF_COMMAND, S_BOOLEAN }, { "bool", T_TYPE, TF_COMMAND, S_BOOLEAN },
{ "boolean", T_TYPE, TF_COMMAND, S_BOOLEAN },
{ "def_bool", T_DEFAULT, TF_COMMAND, S_BOOLEAN }, { "def_bool", T_DEFAULT, TF_COMMAND, S_BOOLEAN },
{ "int", T_TYPE, TF_COMMAND, S_INT }, { "int", T_TYPE, TF_COMMAND, S_INT },
{ "hex", T_TYPE, TF_COMMAND, S_HEX }, { "hex", T_TYPE, TF_COMMAND, S_HEX },

2
scripts/kconfig/mconf.c
View File

@ -246,7 +246,7 @@ search_help[] = N_(
" Selected by: BAR [=n]\n" " Selected by: BAR [=n]\n"
"-----------------------------------------------------------------\n" "-----------------------------------------------------------------\n"
"o The line 'Type:' shows the type of the configuration option for\n" "o The line 'Type:' shows the type of the configuration option for\n"
" this symbol (boolean, tristate, string, ...)\n" " this symbol (bool, tristate, string, ...)\n"
"o The line 'Prompt:' shows the text used in the menu structure for\n" "o The line 'Prompt:' shows the text used in the menu structure for\n"
" this symbol\n" " this symbol\n"
"o The 'Defined at' line tells at what file / line number the symbol\n" "o The 'Defined at' line tells at what file / line number the symbol\n"

4
scripts/kconfig/menu.c
View File

@ -269,13 +269,13 @@ static void sym_check_prop(struct symbol *sym)
if (sym->type != S_BOOLEAN && sym->type != S_TRISTATE) if (sym->type != S_BOOLEAN && sym->type != S_TRISTATE)
prop_warn(prop, prop_warn(prop,
"config symbol '%s' uses %s, but is " "config symbol '%s' uses %s, but is "
"not boolean or tristate", sym->name, use); "not bool or tristate", sym->name, use);
else if (sym2->type != S_UNKNOWN && else if (sym2->type != S_UNKNOWN &&
sym2->type != S_BOOLEAN && sym2->type != S_BOOLEAN &&
sym2->type != S_TRISTATE) sym2->type != S_TRISTATE)
prop_warn(prop, prop_warn(prop,
"'%s' has wrong type. '%s' only " "'%s' has wrong type. '%s' only "
"accept arguments of boolean and " "accept arguments of bool and "
"tristate type", sym2->name, use); "tristate type", sym2->name, use);
break; break;
case P_RANGE: case P_RANGE:

2
scripts/kconfig/symbol.c
View File

@ -77,7 +77,7 @@ const char *sym_type_name(enum symbol_type type)
{ {
switch (type) { switch (type) {
case S_BOOLEAN: case S_BOOLEAN:
return "boolean"; return "bool";
case S_TRISTATE: case S_TRISTATE:
return "tristate"; return "tristate";
case S_INT: case S_INT:

2
scripts/kconfig/zconf.y
View File

@ -639,7 +639,7 @@ static void print_symbol(FILE *out, struct menu *menu)
fprintf(out, "\nconfig %s\n", sym->name); fprintf(out, "\nconfig %s\n", sym->name);
switch (sym->type) { switch (sym->type) {
case S_BOOLEAN: case S_BOOLEAN:
fputs(" boolean\n", out); fputs(" bool\n", out);
break; break;
case S_TRISTATE: case S_TRISTATE:
fputs(" tristate\n", out); fputs(" tristate\n", out);