From: Masahiro Yamada <masahiroy@kernel.org>
Date: Wed, 17 Jun 2020 03:02:20 +0000 (+0900)
Subject: Revert "checkpatch: kconfig: prefer 'help' over '---help---'"
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=22a4ac026c15eba961883ed8466cb341e0447de1;p=linux.git

Revert "checkpatch: kconfig: prefer 'help' over '---help---'"

This reverts commit 84af7a6194e493fae312a2b7fa5a3b51f76d9282.

The conversion is done.

Cc: Ulf Magnusson <ulfalizer@gmail.com>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 4c820607540bf..1351e052eb99c 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;
 				}