From patchwork Thu Apr 21 13:28:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yingjoe Chen X-Patchwork-Id: 66385 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp147751qge; Thu, 21 Apr 2016 06:28:34 -0700 (PDT) X-Received: by 10.66.221.136 with SMTP id qe8mr20383541pac.7.1461245314658; Thu, 21 Apr 2016 06:28:34 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v8si741899pfi.16.2016.04.21.06.28.34; Thu, 21 Apr 2016 06:28:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752331AbcDUN2X (ORCPT + 29 others); Thu, 21 Apr 2016 09:28:23 -0400 Received: from mailgw02.mediatek.com ([210.61.82.184]:13781 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751675AbcDUN2V (ORCPT ); Thu, 21 Apr 2016 09:28:21 -0400 Received: from mtkhts07.mediatek.inc [(172.21.101.69)] by mailgw02.mediatek.com (envelope-from ) (mhqrelay.mediatek.com ESMTP with TLS) with ESMTP id 499761105; Thu, 21 Apr 2016 21:28:17 +0800 Received: from mtksdtcf02.mediatek.inc (10.21.12.142) by mtkhts07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 14.3.266.1; Thu, 21 Apr 2016 21:28:15 +0800 From: Yingjoe Chen To: Andy Whitcroft , Joe Perches CC: , , Yingjoe Chen Subject: [PATCH 2/3] checkpatch: testing more config for Kconfig help text Date: Thu, 21 Apr 2016 21:28:04 +0800 Message-ID: <1461245285-14918-2-git-send-email-yingjoe.chen@mediatek.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1461245285-14918-1-git-send-email-yingjoe.chen@mediatek.com> References: <1461245285-14918-1-git-send-email-yingjoe.chen@mediatek.com> MIME-Version: 1.0 X-MTK: N Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- scripts/checkpatch.pl | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) -- 1.9.1 diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 1c43dc1..2bf4499 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,10 @@ sub process { $f =~ s/#.*//; $f =~ s/^\s+//; next if ($f =~ /^$/); - if ($f =~ /^\s*config\s/) { + if ($f =~ /^\s*config\s/ || $f =~ /^\s*menuconfig\s/ || $f =~ /^\s*choice\s/ || + $f =~ /^\s*endchoice$/ || $f =~ /^\s*comment\s/ || $f =~ /^\s*menu\s/ || + $f =~ /^\s*endmenu$/ || $f =~ /^\s*if\s/ || $f =~ /^\s*endif$/ || + $f =~ /^\s*source\s/) { $is_end = 1; last; }