From: Yingjoe Chen <yingjoe.chen@mediatek.com>
To: Andy Whitcroft <apw@canonical.com>, Joe Perches <joe@perches.com>
Cc: <linux-kernel@vger.kernel.org>, <srv_heupstream@mediatek.com>,
Yingjoe Chen <yingjoe.chen@mediatek.com>
Subject: [PATCH 2/3] checkpatch: testing more config for Kconfig help text
Date: Thu, 21 Apr 2016 21:28:04 +0800 [thread overview]
Message-ID: <1461245285-14918-2-git-send-email-yingjoe.chen@mediatek.com> (raw)
In-Reply-To: <1461245285-14918-1-git-send-email-yingjoe.chen@mediatek.com>
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 <yingjoe.chen@mediatek.com>
---
scripts/checkpatch.pl | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
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;
}
--
1.9.1
next prev parent reply other threads:[~2016-04-21 13:28 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-21 13:28 [PATCH 1/3] checkpatch: add Kconfig 'default n' test Yingjoe Chen
2016-04-21 13:28 ` Yingjoe Chen [this message]
2016-04-21 17:06 ` [PATCH 2/3] checkpatch: testing more config for Kconfig help text Joe Perches
2016-04-22 13:29 ` Yingjoe Chen
2016-04-21 13:28 ` [PATCH 3/3] checkpatch: relax Kconfig help text line number threshold Yingjoe Chen
2016-04-21 17:00 ` Joe Perches
2016-04-21 17:39 ` Andi Kleen
2016-04-22 13:27 ` Yingjoe Chen
2016-04-21 17:16 ` [PATCH 1/3] checkpatch: add Kconfig 'default n' test Joe Perches
2016-04-21 18:21 ` Paul Bolle
2016-04-22 14:19 ` Yingjoe Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1461245285-14918-2-git-send-email-yingjoe.chen@mediatek.com \
--to=yingjoe.chen@mediatek.com \
--cc=apw@canonical.com \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=srv_heupstream@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).