aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2015-04-16 15:44:53 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2015-04-17 09:03:59 -0400
commite0df7e1faebad9a7ac0931d03f86fcd5c0d1896e (patch)
treeaf960392072968740794d8e8b9cf1e42cf1c0ff2 /scripts
parent323b267faff4db5f2424b6c09ab78a272393b69e (diff)
checkpatch: avoid "spaces required around that ':'" false positive
Since commit 1f65f947a6a8 ("checkpatch: add checks for question mark and colon spacing") back in 2008, checkpatch has reported false positive for asm volatile uses of "::" checkpatch thinks colons should always have spaces around it. Add an exception for colons with colons on either side for this valid asm volatile (and c++) use. Signed-off-by: Joe Perches <joe@perches.com> Reported-by: Yehuda Yitschak <yehuday@marvell.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.pl8
1 files changed, 8 insertions, 0 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 35aecb3b013c..89b1df4e72ab 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -3845,6 +3845,14 @@ sub process {
3845 $ok = 1; 3845 $ok = 1;
3846 } 3846 }
3847 3847
3848 # for asm volatile statements
3849 # ignore a colon with another
3850 # colon immediately before or after
3851 if (($op eq ':') &&
3852 ($ca =~ /:$/ || $cc =~ /^:/)) {
3853 $ok = 1;
3854 }
3855
3848 # messages are ERROR, but ?: are CHK 3856 # messages are ERROR, but ?: are CHK
3849 if ($ok == 0) { 3857 if ($ok == 0) {
3850 my $msg_type = \&ERROR; 3858 my $msg_type = \&ERROR;