kconfig: remove '---help---' support
Subsystems (3)
PATCH 1/2 kconfig: remove '---help---' support
The conversion is done. No more user of '---help---'.
---
scripts/checkkconfigsymbols.py | 2 +- scripts/kconfig/lexer.l | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
scripts/checkkconfigsymbols.py +1 -1
@@ -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("(\"(.*?)\")")
scripts/kconfig/lexer.l +1 -1
@@ -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;
Signature · 1 line
2.25.1
PATCH 2/2 Revert "checkpatch: kconfig: prefer 'help' over '---help---'"
This reverts commit 84af7a6194e493fae312a2b7fa5a3b51f76d9282.
The conversion is done.
---
scripts/checkpatch.pl | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
scripts/checkpatch.pl +1 -5
@@ -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; }
Signature · 1 line
2.25.1
Joe Perches
maintainerRe: [PATCH 2/2] Revert "checkpatch: kconfig: prefer 'help' over '---help---'"
Quoted 1 line · Masahiro Yamada
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(-)
scripts/checkkconfigsymbols.py +1 -1
@@ -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("(\"(.*?)\")")
scripts/checkpatch.pl +1 -5
@@ -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; }
scripts/kconfig/lexer.l +1 -1
@@ -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;
Re: [PATCH 2/2] Revert "checkpatch: kconfig: prefer 'help' over '---help---'"
Quoted 6 lines · Joe Perches
Quoted 1 line · Masahiro Yamada
This reverts commit
84af7a6194e493fae312a2b7fa5a3b51f76d9282.
Yes, I removed --help-- support in 1/2.
https://patchwork.kernel.org/patch/11608927/
Quoted 50 lines
scripts/checkkconfigsymbols.py | 2 +- scripts/checkpatch.pl | 6 +----- scripts/kconfig/lexer.l | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-)scripts/checkkconfigsymbols.py +1
-1@@ -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("(\"(.*?)\")")scripts/checkpatch.pl +1
-5@@ -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; }scripts/kconfig/lexer.l +1
-1@@ -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;
Signature · 2 lines
Best Regards Masahiro Yamada
Quoted 5 lines · Masahiro Yamada
The conversion is done. No more user of '---help---'.
Cc Ulf Magnusson <[email protected]>Signed-off-by Masahiro Yamada <[email protected]>
Applied to linux-kbuild.
Quoted 35 lines
---
scripts/checkkconfigsymbols.py | 2 +- scripts/kconfig/lexer.l | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)scripts/checkkconfigsymbols.py +1
-1@@ -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("(\"(.*?)\")")scripts/kconfig/lexer.l +1
-2@@ -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
Signature · 2 lines
Best Regards Masahiro Yamada