From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Fri, 15 Dec 2017 15:38:02 +0000 (+0900)
Subject: kconfig: drop 'boolean' keyword
X-Git-Url: https://jxself.org/git/?p=carl9170fw.git;a=commitdiff_plain;h=2f1132cbcec40e431991cda7ff3744455b46c3df

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>
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
---

diff --git a/config/confdata.c b/config/confdata.c
index e606f06..204e751 100644
--- a/config/confdata.c
+++ b/config/confdata.c
@@ -1186,7 +1186,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
 					 */
diff --git a/config/kconf_id.c b/config/kconf_id.c
index 5abbc72..3ea9c5f 100644
--- a/config/kconf_id.c
+++ b/config/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 },
diff --git a/config/menu.c b/config/menu.c
index 93fe2fb..47bec34 100644
--- a/config/menu.c
+++ b/config/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:
diff --git a/config/symbol.c b/config/symbol.c
index 55c95e0..c9123ed 100644
--- a/config/symbol.c
+++ b/config/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:
diff --git a/config/zconf.y b/config/zconf.y
index dae1498..f2b9744 100644
--- a/config/zconf.y
+++ b/config/zconf.y
@@ -640,7 +640,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);