* [PATCH 1/2] kconfig: remove '---help---' support
@ 2020-06-17 3:02 Masahiro Yamada
2020-06-17 3:02 ` [PATCH 2/2] Revert "checkpatch: kconfig: prefer 'help' over '---help---'" Masahiro Yamada
2020-06-29 0:54 ` [PATCH 1/2] kconfig: remove '---help---' support Masahiro Yamada
0 siblings, 2 replies; 5+ messages in thread
From: Masahiro Yamada @ 2020-06-17 3:02 UTC (permalink / raw)
To: linux-kbuild; +Cc: Masahiro Yamada, Ulf Magnusson, linux-kernel
The conversion is done. No more user of '---help---'.
Cc: Ulf Magnusson <ulfalizer@gmail.com>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
scripts/checkkconfigsymbols.py | 2 +-
scripts/kconfig/lexer.l | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/checkkconfigsymbols.py b/scripts/checkkconfigsymbols.py
index 00a10a293f4f..1548f9ce4682 100755
--- a/scripts/checkkconfigsymbols.py
+++ b/scripts/checkkconfigsymbols.py
@@ -34,7 +34,7 @@ REGEX_SOURCE_SYMBOL = re.compile(SOURCE_SYMBOL)
REGEX_KCONFIG_DEF = re.compile(DEF)
REGEX_KCONFIG_EXPR = re.compile(EXPR)
REGEX_KCONFIG_STMT = re.compile(STMT)
-REGEX_KCONFIG_HELP = re.compile(r"^\s+(help|---help---)\s*$")
+REGEX_KCONFIG_HELP = re.compile(r"^\s+help\s*$")
REGEX_FILTER_SYMBOLS = re.compile(r"[A-Za-z0-9]$")
REGEX_NUMERIC = re.compile(r"0[xX][0-9a-fA-F]+|[0-9]+")
REGEX_QUOTES = re.compile("(\"(.*?)\")")
diff --git a/scripts/kconfig/lexer.l b/scripts/kconfig/lexer.l
index 6354c905b006..4b7339ff4c8b 100644
--- a/scripts/kconfig/lexer.l
+++ b/scripts/kconfig/lexer.l
@@ -105,7 +105,7 @@ n [A-Za-z0-9_-]
"endchoice" return T_ENDCHOICE;
"endif" return T_ENDIF;
"endmenu" return T_ENDMENU;
-"help"|"---help---" return T_HELP;
+"help" return T_HELP;
"hex" return T_HEX;
"if" return T_IF;
"imply" return T_IMPLY;
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/2] Revert "checkpatch: kconfig: prefer 'help' over '---help---'"
2020-06-17 3:02 [PATCH 1/2] kconfig: remove '---help---' support Masahiro Yamada
@ 2020-06-17 3:02 ` Masahiro Yamada
2020-06-17 4:36 ` Joe Perches
2020-06-29 0:54 ` [PATCH 1/2] kconfig: remove '---help---' support Masahiro Yamada
1 sibling, 1 reply; 5+ messages in thread
From: Masahiro Yamada @ 2020-06-17 3:02 UTC (permalink / raw)
To: linux-kbuild
Cc: Masahiro Yamada, Ulf Magnusson, Andy Whitcroft, Joe Perches,
linux-kernel
This reverts commit 84af7a6194e493fae312a2b7fa5a3b51f76d9282.
The conversion is done.
Cc: Ulf Magnusson <ulfalizer@gmail.com>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
scripts/checkpatch.pl | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 4c820607540b..1351e052eb99 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -3042,11 +3042,7 @@ sub process {
if ($lines[$ln - 1] =~ /^\+\s*(?:bool|tristate|prompt)\s*["']/) {
$is_start = 1;
- } elsif ($lines[$ln - 1] =~ /^\+\s*(?:help|---help---)\s*$/) {
- if ($lines[$ln - 1] =~ "---help---") {
- WARN("CONFIG_DESCRIPTION",
- "prefer 'help' over '---help---' for new help texts\n" . $herecurr);
- }
+ } elsif ($lines[$ln - 1] =~ /^\+\s*(?:---)?help(?:---)?$/) {
$length = -1;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 2/2] Revert "checkpatch: kconfig: prefer 'help' over '---help---'"
2020-06-17 3:02 ` [PATCH 2/2] Revert "checkpatch: kconfig: prefer 'help' over '---help---'" Masahiro Yamada
@ 2020-06-17 4:36 ` Joe Perches
2020-06-19 4:56 ` Masahiro Yamada
0 siblings, 1 reply; 5+ messages in thread
From: Joe Perches @ 2020-06-17 4:36 UTC (permalink / raw)
To: Masahiro Yamada, linux-kbuild; +Cc: Ulf Magnusson, Andy Whitcroft, linux-kernel
On Wed, 2020-06-17 at 12:02 +0900, Masahiro Yamada wrote:
> This reverts commit 84af7a6194e493fae312a2b7fa5a3b51f76d9282.
Also: https://lore.kernel.org/patchwork/patch/1255848/
---
scripts/checkkconfigsymbols.py | 2 +-
scripts/checkpatch.pl | 6 +-----
scripts/kconfig/lexer.l | 2 +-
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/scripts/checkkconfigsymbols.py b/scripts/checkkconfigsymbols.py
index 00a10a293f4f..1548f9ce4682 100755
--- a/scripts/checkkconfigsymbols.py
+++ b/scripts/checkkconfigsymbols.py
@@ -34,7 +34,7 @@ REGEX_SOURCE_SYMBOL = re.compile(SOURCE_SYMBOL)
REGEX_KCONFIG_DEF = re.compile(DEF)
REGEX_KCONFIG_EXPR = re.compile(EXPR)
REGEX_KCONFIG_STMT = re.compile(STMT)
-REGEX_KCONFIG_HELP = re.compile(r"^\s+(help|---help---)\s*$")
+REGEX_KCONFIG_HELP = re.compile(r"^\s+help\s*$")
REGEX_FILTER_SYMBOLS = re.compile(r"[A-Za-z0-9]$")
REGEX_NUMERIC = re.compile(r"0[xX][0-9a-fA-F]+|[0-9]+")
REGEX_QUOTES = re.compile("(\"(.*?)\")")
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 524df88f9364..738bb3fcf202 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -3044,11 +3044,7 @@ sub process {
if ($lines[$ln - 1] =~ /^\+\s*(?:bool|tristate|prompt)\s*["']/) {
$is_start = 1;
- } elsif ($lines[$ln - 1] =~ /^\+\s*(?:help|---help---)\s*$/) {
- if ($lines[$ln - 1] =~ "---help---") {
- WARN("CONFIG_DESCRIPTION",
- "prefer 'help' over '---help---' for new help texts\n" . $herecurr);
- }
+ } elsif ($lines[$ln - 1] =~ /^\+\s*help\s*$/) {
$length = -1;
}
diff --git a/scripts/kconfig/lexer.l b/scripts/kconfig/lexer.l
index 6354c905b006..4b7339ff4c8b 100644
--- a/scripts/kconfig/lexer.l
+++ b/scripts/kconfig/lexer.l
@@ -105,7 +105,7 @@ n [A-Za-z0-9_-]
"endchoice" return T_ENDCHOICE;
"endif" return T_ENDIF;
"endmenu" return T_ENDMENU;
-"help"|"---help---" return T_HELP;
+"help" return T_HELP;
"hex" return T_HEX;
"if" return T_IF;
"imply" return T_IMPLY;
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 2/2] Revert "checkpatch: kconfig: prefer 'help' over '---help---'"
2020-06-17 4:36 ` Joe Perches
@ 2020-06-19 4:56 ` Masahiro Yamada
0 siblings, 0 replies; 5+ messages in thread
From: Masahiro Yamada @ 2020-06-19 4:56 UTC (permalink / raw)
To: Joe Perches
Cc: Linux Kbuild mailing list, Ulf Magnusson, Andy Whitcroft,
Linux Kernel Mailing List
On Wed, Jun 17, 2020 at 1:37 PM Joe Perches <joe@perches.com> wrote:
>
> On Wed, 2020-06-17 at 12:02 +0900, Masahiro Yamada wrote:
> > This reverts commit 84af7a6194e493fae312a2b7fa5a3b51f76d9282.
>
> Also: https://lore.kernel.org/patchwork/patch/1255848/
> ---
Yes, I removed --help-- support in 1/2.
https://patchwork.kernel.org/patch/11608927/
> scripts/checkkconfigsymbols.py | 2 +-
> scripts/checkpatch.pl | 6 +-----
> scripts/kconfig/lexer.l | 2 +-
> 3 files changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/scripts/checkkconfigsymbols.py b/scripts/checkkconfigsymbols.py
> index 00a10a293f4f..1548f9ce4682 100755
> --- a/scripts/checkkconfigsymbols.py
> +++ b/scripts/checkkconfigsymbols.py
> @@ -34,7 +34,7 @@ REGEX_SOURCE_SYMBOL = re.compile(SOURCE_SYMBOL)
> REGEX_KCONFIG_DEF = re.compile(DEF)
> REGEX_KCONFIG_EXPR = re.compile(EXPR)
> REGEX_KCONFIG_STMT = re.compile(STMT)
> -REGEX_KCONFIG_HELP = re.compile(r"^\s+(help|---help---)\s*$")
> +REGEX_KCONFIG_HELP = re.compile(r"^\s+help\s*$")
> REGEX_FILTER_SYMBOLS = re.compile(r"[A-Za-z0-9]$")
> REGEX_NUMERIC = re.compile(r"0[xX][0-9a-fA-F]+|[0-9]+")
> REGEX_QUOTES = re.compile("(\"(.*?)\")")
> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
> index 524df88f9364..738bb3fcf202 100755
> --- a/scripts/checkpatch.pl
> +++ b/scripts/checkpatch.pl
> @@ -3044,11 +3044,7 @@ sub process {
>
> if ($lines[$ln - 1] =~ /^\+\s*(?:bool|tristate|prompt)\s*["']/) {
> $is_start = 1;
> - } elsif ($lines[$ln - 1] =~ /^\+\s*(?:help|---help---)\s*$/) {
> - if ($lines[$ln - 1] =~ "---help---") {
> - WARN("CONFIG_DESCRIPTION",
> - "prefer 'help' over '---help---' for new help texts\n" . $herecurr);
> - }
> + } elsif ($lines[$ln - 1] =~ /^\+\s*help\s*$/) {
> $length = -1;
> }
>
> diff --git a/scripts/kconfig/lexer.l b/scripts/kconfig/lexer.l
> index 6354c905b006..4b7339ff4c8b 100644
> --- a/scripts/kconfig/lexer.l
> +++ b/scripts/kconfig/lexer.l
> @@ -105,7 +105,7 @@ n [A-Za-z0-9_-]
> "endchoice" return T_ENDCHOICE;
> "endif" return T_ENDIF;
> "endmenu" return T_ENDMENU;
> -"help"|"---help---" return T_HELP;
> +"help" return T_HELP;
> "hex" return T_HEX;
> "if" return T_IF;
> "imply" return T_IMPLY;
>
>
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] kconfig: remove '---help---' support
2020-06-17 3:02 [PATCH 1/2] kconfig: remove '---help---' support Masahiro Yamada
2020-06-17 3:02 ` [PATCH 2/2] Revert "checkpatch: kconfig: prefer 'help' over '---help---'" Masahiro Yamada
@ 2020-06-29 0:54 ` Masahiro Yamada
1 sibling, 0 replies; 5+ messages in thread
From: Masahiro Yamada @ 2020-06-29 0:54 UTC (permalink / raw)
To: Linux Kbuild mailing list; +Cc: Ulf Magnusson, Linux Kernel Mailing List
On Wed, Jun 17, 2020 at 12:02 PM Masahiro Yamada <masahiroy@kernel.org> wrote:
>
> The conversion is done. No more user of '---help---'.
>
> Cc: Ulf Magnusson <ulfalizer@gmail.com>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Applied to linux-kbuild.
> ---
>
> scripts/checkkconfigsymbols.py | 2 +-
> scripts/kconfig/lexer.l | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/scripts/checkkconfigsymbols.py b/scripts/checkkconfigsymbols.py
> index 00a10a293f4f..1548f9ce4682 100755
> --- a/scripts/checkkconfigsymbols.py
> +++ b/scripts/checkkconfigsymbols.py
> @@ -34,7 +34,7 @@ REGEX_SOURCE_SYMBOL = re.compile(SOURCE_SYMBOL)
> REGEX_KCONFIG_DEF = re.compile(DEF)
> REGEX_KCONFIG_EXPR = re.compile(EXPR)
> REGEX_KCONFIG_STMT = re.compile(STMT)
> -REGEX_KCONFIG_HELP = re.compile(r"^\s+(help|---help---)\s*$")
> +REGEX_KCONFIG_HELP = re.compile(r"^\s+help\s*$")
> REGEX_FILTER_SYMBOLS = re.compile(r"[A-Za-z0-9]$")
> REGEX_NUMERIC = re.compile(r"0[xX][0-9a-fA-F]+|[0-9]+")
> REGEX_QUOTES = re.compile("(\"(.*?)\")")
> diff --git a/scripts/kconfig/lexer.l b/scripts/kconfig/lexer.l
> index 6354c905b006..4b7339ff4c8b 100644
> --- a/scripts/kconfig/lexer.l
> +++ b/scripts/kconfig/lexer.l
> @@ -105,7 +105,7 @@ n [A-Za-z0-9_-]
> "endchoice" return T_ENDCHOICE;
> "endif" return T_ENDIF;
> "endmenu" return T_ENDMENU;
> -"help"|"---help---" return T_HELP;
> +"help" return T_HELP;
> "hex" return T_HEX;
> "if" return T_IF;
> "imply" return T_IMPLY;
> --
> 2.25.1
>
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-06-29 0:55 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-17 3:02 [PATCH 1/2] kconfig: remove '---help---' support Masahiro Yamada
2020-06-17 3:02 ` [PATCH 2/2] Revert "checkpatch: kconfig: prefer 'help' over '---help---'" Masahiro Yamada
2020-06-17 4:36 ` Joe Perches
2020-06-19 4:56 ` Masahiro Yamada
2020-06-29 0:54 ` [PATCH 1/2] kconfig: remove '---help---' support Masahiro Yamada
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox