Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754322AbcDVOca (ORCPT ); Fri, 22 Apr 2016 10:32:30 -0400 Received: from mailgw01.mediatek.com ([210.61.82.183]:46034 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1754261AbcDVOc1 (ORCPT ); Fri, 22 Apr 2016 10:32:27 -0400 From: Yingjoe Chen To: Andy Whitcroft , Joe Perches CC: , Andi Kleen , Paul Bolle , , Yingjoe Chen Subject: [PATCH v2 2/3] checkpatch: testing more config for Kconfig help text Date: Fri, 22 Apr 2016 22:32:06 +0800 Message-ID: <1461335527-19270-2-git-send-email-yingjoe.chen@mediatek.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1461335527-19270-1-git-send-email-yingjoe.chen@mediatek.com> References: <1461335527-19270-1-git-send-email-yingjoe.chen@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1226 Lines: 41 Current help text check only check a config option if it is followed by another config. Adding check for help text if the next entry is menuconfig, choice/ endchoice, comment, menu/endmenu, if/endif, source or end of file. Signed-off-by: Yingjoe Chen --- Change in v2: - Change according to Joe Perches' suggestion scripts/checkpatch.pl | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 3cb7c2d..403ebbc 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2563,6 +2563,12 @@ sub process { next if ($f =~ /^-/); last if (!$file && $f =~ /^\@\@/); + if ($f !~ /^[+\- ]/) { + # End of file + $is_end = 1; + last; + } + if ($lines[$ln - 1] =~ /^\+\s*(?:bool|tristate)\s*\"/) { $is_start = 1; } elsif ($lines[$ln - 1] =~ /^\+\s*(?:---)?help(?:---)?$/) { @@ -2573,7 +2579,7 @@ sub process { $f =~ s/#.*//; $f =~ s/^\s+//; next if ($f =~ /^$/); - if ($f =~ /^\s*config\s/) { + if ($f =~ /^(?:config\s|menuconfig\s|choice\s|endchoice\s*$|comment\s|menu\s|endmenu\s*$|if\s|endif\s*$|source\s)/) { $is_end = 1; last; } -- 1.9.1