Commit b92d804a authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kconfig: drop 'boolean' keyword 



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

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: default avatarLuis R. Rodriguez <mcgrof@kernel.org>
parent 1ae83c5c

scripts/kconfig/confdata.c

+1 −1
Original line number Diff line number Diff line
@@ -1123,7 +1123,7 @@ void set_all_choice_values(struct symbol *csym) 
bool conf_set_all_new_symbols(enum conf_def_mode mode)

{

	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

					 * ptm: probability of tristate = m

					 */

scripts/kconfig/kconf_id.c

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ static struct kconf_id kconf_id_array[] = { 
	{ "tristate",		T_TYPE,			TF_COMMAND, S_TRISTATE },

	{ "def_tristate",	T_DEFAULT,		TF_COMMAND, S_TRISTATE },

	{ "bool",		T_TYPE,			TF_COMMAND, S_BOOLEAN },

	{ "boolean",		T_TYPE,			TF_COMMAND, S_BOOLEAN },

	{ "def_bool",		T_DEFAULT,		TF_COMMAND, S_BOOLEAN },

	{ "int",		T_TYPE,			TF_COMMAND, S_INT },

	{ "hex",		T_TYPE,			TF_COMMAND, S_HEX },

scripts/kconfig/mconf.c

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ search_help[] = N_( 
	"  Selected by: BAR [=n]\n"

	"-----------------------------------------------------------------\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"

	"  this symbol\n"

	"o The 'Defined at' line tells at what file / line number the symbol\n"

scripts/kconfig/menu.c

+2 −2
Original line number Diff line number Diff line
@@ -269,13 +269,13 @@ static void sym_check_prop(struct symbol *sym) 
			if (sym->type != S_BOOLEAN && sym->type != S_TRISTATE)

				prop_warn(prop,

				    "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 &&

				 sym2->type != S_BOOLEAN &&

				 sym2->type != S_TRISTATE)

				prop_warn(prop,

				    "'%s' has wrong type. '%s' only "

				    "accept arguments of boolean and "

				    "accept arguments of bool and "

				    "tristate type", sym2->name, use);

			break;

		case P_RANGE:

scripts/kconfig/symbol.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ const char *sym_type_name(enum symbol_type type) 
{

	switch (type) {

	case S_BOOLEAN:

		return "boolean";

		return "bool";

	case S_TRISTATE:

		return "tristate";

	case S_INT:

CRA Git | Maintained and supported by SUSTech CRA and CCSE