[PATCH 1/2] kconfig: use bool instead of boolean for type definition attributes, again

[PATCH 1/2] kconfig: use bool instead of boolean for type definition attributes, again

[Masahiro Yamada]

Commit 6341e62b212a ("kconfig: use bool instead of boolean for type
definition attributes") did treewide replacement of 'boolean', and
also mentioned the keyword 'boolean' would be dropped later on.

Some years have passed, but it has not happened yet.  Meanwhile, some
new instances have come up.

I am really going to drop this keyword.  I need to do the replacement
once again.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 drivers/firmware/efi/Kconfig    | 2 +-
 drivers/staging/rtlwifi/Kconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig
index 2b4c39f..3abdda1 100644
--- a/drivers/firmware/efi/Kconfig
+++ b/drivers/firmware/efi/Kconfig
@@ -113,7 +113,7 @@ config EFI_CAPSULE_LOADER
 	  Most users should say N.
 
 config EFI_CAPSULE_QUIRK_QUARK_CSH
-	boolean "Add support for Quark capsules with non-standard headers"
+	bool "Add support for Quark capsules with non-standard headers"
 	depends on X86 && !64BIT
 	select EFI_CAPSULE_LOADER
 	default y
diff --git a/drivers/staging/rtlwifi/Kconfig b/drivers/staging/rtlwifi/Kconfig
index cb3a29a..12cf467 100644
--- a/drivers/staging/rtlwifi/Kconfig
+++ b/drivers/staging/rtlwifi/Kconfig
@@ -17,6 +17,6 @@ config RTLPHYDM_ST
 	default m
 
 config RTLWIFI_DEBUG_ST
-	boolean
+	bool
 	depends on R8822BE
 	default y
-- 
2.7.4

[PATCH 2/2] kconfig: drop 'boolean' keyword

[Masahiro Yamada]

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

 scripts/kconfig/confdata.c | 2 +-
 scripts/kconfig/kconf_id.c | 1 -
 scripts/kconfig/mconf.c    | 2 +-
 scripts/kconfig/menu.c     | 4 ++--
 scripts/kconfig/symbol.c   | 2 +-
 scripts/kconfig/zconf.y    | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 297b079..027f5b4 100644
--- a/scripts/kconfig/confdata.c
+++ b/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
 					 */
diff --git a/scripts/kconfig/kconf_id.c b/scripts/kconfig/kconf_id.c
index 5abbc72..3ea9c5f 100644
--- a/scripts/kconfig/kconf_id.c
+++ b/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 },
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 315ce2c..c829be8b 100644
--- a/scripts/kconfig/mconf.c
+++ b/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"
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index 2baebe3..5878876 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -274,13 +274,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/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index 35e0937..23142a5 100644
--- a/scripts/kconfig/symbol.c
+++ b/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:
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y
index 4b2cf41..dd926e0 100644
--- a/scripts/kconfig/zconf.y
+++ b/scripts/kconfig/zconf.y
@@ -623,7 +623,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);
-- 
2.7.4

Re: [PATCH 2/2] kconfig: drop 'boolean' keyword

[Luis R. Rodriguez]

On Sat, Dec 16, 2017 at 12:38:02AM +0900, Masahiro Yamada wrote:
> 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>

Provided you get 0-day test it without complaints:

Acked-by: Luis R. Rodriguez <mcgrof@kernel.org>

  Luis

Re: [PATCH 1/2] kconfig: use bool instead of boolean for type definition attributes, again

[Greg Kroah-Hartman]

On Sat, Dec 16, 2017 at 12:38:01AM +0900, Masahiro Yamada wrote:
> Commit 6341e62b212a ("kconfig: use bool instead of boolean for type
> definition attributes") did treewide replacement of 'boolean', and
> also mentioned the keyword 'boolean' would be dropped later on.
> 
> Some years have passed, but it has not happened yet.  Meanwhile, some
> new instances have come up.
> 
> I am really going to drop this keyword.  I need to do the replacement
> once again.
> 
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
> 
>  drivers/firmware/efi/Kconfig    | 2 +-
>  drivers/staging/rtlwifi/Kconfig | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Re: [PATCH 1/2] kconfig: use bool instead of boolean for type definition attributes, again

[Masahiro Yamada]

2017-12-16 0:38 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>:
> Commit 6341e62b212a ("kconfig: use bool instead of boolean for type
> definition attributes") did treewide replacement of 'boolean', and
> also mentioned the keyword 'boolean' would be dropped later on.
>
> Some years have passed, but it has not happened yet.  Meanwhile, some
> new instances have come up.
>
> I am really going to drop this keyword.  I need to do the replacement
> once again.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>

Applied to linux-kbuild/kconfig.


-- 
Best Regards
Masahiro Yamada

Re: [PATCH 2/2] kconfig: drop 'boolean' keyword

[Masahiro Yamada]

2017-12-16 0:38 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>:
> 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>
> ---
>

Applied to linux-kbuild/kconfig.


-- 
Best Regards
Masahiro Yamada