summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2013-09-11 14:23:59 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-11 15:58:44 -0700
commit61135e966367eda5056504ffd2f7518eaf77e25b (patch)
tree147fa33fb15f77eb5af50ad845ea19ba00f3cae9 /scripts
parent70dc8a48357ce630d8a76887a9a36f0d34c8caf2 (diff)
downloadop-kernel-dev-61135e966367eda5056504ffd2f7518eaf77e25b.zip
op-kernel-dev-61135e966367eda5056504ffd2f7518eaf77e25b.tar.gz
checkpatch: fix networking kernel-doc block comment defect
checkpatch can generate a false positive when inserting a new kernel-doc block and function above an existing kernel-doc block. Fix it by checking that the context line is also a newly inserted line. Signed-off-by: Joe Perches <joe@perches.com> Reported-by: Darren Hart <dvhart@linux.intel.com> 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.pl1
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index e2cb1f4..9185883 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2086,6 +2086,7 @@ sub process {
if ($realfile =~ m@^(drivers/net/|net/)@ &&
$prevrawline =~ /^\+[ \t]*\/\*/ && #starting /*
$prevrawline !~ /\*\/[ \t]*$/ && #no trailing */
+ $rawline =~ /^\+/ && #line is new
$rawline !~ /^\+[ \t]*\*/) { #no leading *
WARN("NETWORKING_BLOCK_COMMENT_STYLE",
"networking block comments start with * on subsequent lines\n" . $hereprev);
OpenPOWER on IntegriCloud