From 05f8691572ed18c775510b07cbe82b3409290f10 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Wed, 17 Jun 2020 12:02:20 +0900 Subject: [PATCH] Revert "checkpatch: kconfig: prefer 'help' over '---help---'" This reverts commit d0ebe97b779f5b22dd489d4c42841d2c67b03861. The conversion is done. Cc: Ulf Magnusson Signed-off-by: Masahiro Yamada --- scripts/checkpatch.pl | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) 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; } -- 2.39.5