summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2012-12-18 04:01:56 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-18 05:15:19 +0400
commit481eb486a88c9b068f0168ac4c21291802720933 (patch)
treeded9373e9ace9887f28c8bf3ea1810c600a6b059 /scripts
parent6cd7f3869c925622bbf420e1107a026d91dbd7f2 (diff)
downloadlinux-481eb486a88c9b068f0168ac4c21291802720933.tar.xz
checkpatch: extend line continuation test
Preprocessor directives and asm statements should be allowed to have a line continuation. Signed-off-by: Joe Perches <joe@perches.com> Tested-by: Jingoo Han <jg1.han@samsung.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.pl4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 6fa167758f82..3e9fee60642c 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -3009,10 +3009,12 @@ sub process {
}
}
-# check for line continuations outside of #defines
+# check for line continuations outside of #defines, preprocessor #, and asm
} else {
if ($prevline !~ /^..*\\$/ &&
+ $line !~ /^\+\s*\#.*\\$/ && # preprocessor
+ $line !~ /^\+.*\b(__asm__|asm)\b.*\\$/ && # asm
$line =~ /^\+.*\\$/) {
WARN("LINE_CONTINUATIONS",
"Avoid unnecessary line continuations\n" . $herecurr);