aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2014-08-06 19:10:46 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-06 21:01:27 -0400
commit8d73e0e7dc18a39b120cb85ec675d59516e0af1a (patch)
tree3b8910111c525a14ffe1acc77c22a86a8e0eeaad /scripts
parentfee0aa83d43ee65648778d48d47975c323fa0490 (diff)
checkpatch: quiet Kconfig help message checking
Editing Kconfig dependencies can emit unnecessary messages about missing or too short help entries. Only emit the message when adding help sections to Kconfig files. Signed-off-by: Joe Perches <joe@perches.com> Reported-by: Jean Delvare <jdelvare@suse.de> Tested-by: Jean Delvare <jdelvare@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/checkpatch.pl7
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 146e9f907280..df4250a8ad51 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2052,7 +2052,7 @@ sub process {
2052# Only applies when adding the entry originally, after that we do not have 2052# Only applies when adding the entry originally, after that we do not have
2053# sufficient context to determine whether it is indeed long enough. 2053# sufficient context to determine whether it is indeed long enough.
2054 if ($realfile =~ /Kconfig/ && 2054 if ($realfile =~ /Kconfig/ &&
2055 $line =~ /.\s*config\s+/) { 2055 $line =~ /^\+\s*config\s+/) {
2056 my $length = 0; 2056 my $length = 0;
2057 my $cnt = $realcnt; 2057 my $cnt = $realcnt;
2058 my $ln = $linenr + 1; 2058 my $ln = $linenr + 1;
@@ -2065,10 +2065,11 @@ sub process {
2065 $is_end = $lines[$ln - 1] =~ /^\+/; 2065 $is_end = $lines[$ln - 1] =~ /^\+/;
2066 2066
2067 next if ($f =~ /^-/); 2067 next if ($f =~ /^-/);
2068 last if (!$file && $f =~ /^\@\@/);
2068 2069
2069 if ($lines[$ln - 1] =~ /.\s*(?:bool|tristate)\s*\"/) { 2070 if ($lines[$ln - 1] =~ /^\+\s*(?:bool|tristate)\s*\"/) {
2070 $is_start = 1; 2071 $is_start = 1;
2071 } elsif ($lines[$ln - 1] =~ /.\s*(?:---)?help(?:---)?$/) { 2072 } elsif ($lines[$ln - 1] =~ /^\+\s*(?:---)?help(?:---)?$/) {
2072 $length = -1; 2073 $length = -1;
2073 } 2074 }
2074 2075