summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2016-08-02 14:04:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-08-02 19:35:11 -0400
commitdadf680de3c2eb4cba9840619991eda0cfe98778 (patch)
tree9d6469aab32bf962c5ee55940b3d5f4f8537eccc /scripts
parentd560a5f8a46e98c2f83c5fe699e1d6f6393a14cf (diff)
downloadlinux-dadf680de3c2eb4cba9840619991eda0cfe98778.tar.gz
linux-dadf680de3c2eb4cba9840619991eda0cfe98778.tar.bz2
linux-dadf680de3c2eb4cba9840619991eda0cfe98778.zip
checkpatch: allow c99 style // comments
Sanitise the lines that contain c99 comments so that the error doesn't get emitted. Link: http://lkml.kernel.org/r/d4d22c34ad7bcc1bceb52f0742f76b7a6d585235.1468368420.git.joe@perches.com Signed-off-by: Joe Perches <joe@perches.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.pl6
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index a4476b61e93f..79273003d5e7 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -55,6 +55,7 @@ my $spelling_file = "$D/spelling.txt";
my $codespell = 0;
my $codespellfile = "/usr/share/codespell/dictionary.txt";
my $color = 1;
+my $allow_c99_comments = 1;
sub help {
my ($exitcode) = @_;
@@ -1144,6 +1145,11 @@ sub sanitise_line {
$res =~ s@(\#\s*(?:error|warning)\s+).*@$1$clean@;
}
+ if ($allow_c99_comments && $res =~ m@(//.*$)@) {
+ my $match = $1;
+ $res =~ s/\Q$match\E/"$;" x length($match)/e;
+ }
+
return $res;
}