浏览代码

kconfig: drop 'boolean' keyword

No more users of this keyword.  Drop it according to the notice by
commit 6341e62b212a ("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>
Masahiro Yamada 7 年之前
父节点
当前提交
b92d804a51
共有 6 个文件被更改,包括 6 次插入7 次删除
  1. 1 1
      scripts/kconfig/confdata.c
  2. 0 1
      scripts/kconfig/kconf_id.c
  3. 1 1
      scripts/kconfig/mconf.c
  4. 2 2
      scripts/kconfig/menu.c
  5. 1 1
      scripts/kconfig/symbol.c
  6. 1 1
      scripts/kconfig/zconf.y

+ 1 - 1
scripts/kconfig/confdata.c

@@ -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
 					 */

+ 0 - 1
scripts/kconfig/kconf_id.c

@@ -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 },

+ 1 - 1
scripts/kconfig/mconf.c

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

+ 2 - 2
scripts/kconfig/menu.c

@@ -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:

+ 1 - 1
scripts/kconfig/symbol.c

@@ -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:

+ 1 - 1
scripts/kconfig/zconf.y

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