diff options
-rwxr-xr-x | scripts/checkpatch.pl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 18646f076a84..a2e4a3d9c6d7 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl | |||
@@ -1241,9 +1241,6 @@ sub process { | |||
1241 | #ignore lines being removed | 1241 | #ignore lines being removed |
1242 | if ($line=~/^-/) {next;} | 1242 | if ($line=~/^-/) {next;} |
1243 | 1243 | ||
1244 | # check we are in a valid source file if not then ignore this hunk | ||
1245 | next if ($realfile !~ /\.(h|c|s|S|pl|sh)$/); | ||
1246 | |||
1247 | #trailing whitespace | 1244 | #trailing whitespace |
1248 | if ($line =~ /^\+.*\015/) { | 1245 | if ($line =~ /^\+.*\015/) { |
1249 | my $herevet = "$here\n" . cat_vet($rawline) . "\n"; | 1246 | my $herevet = "$here\n" . cat_vet($rawline) . "\n"; |
@@ -1253,6 +1250,10 @@ sub process { | |||
1253 | my $herevet = "$here\n" . cat_vet($rawline) . "\n"; | 1250 | my $herevet = "$here\n" . cat_vet($rawline) . "\n"; |
1254 | ERROR("trailing whitespace\n" . $herevet); | 1251 | ERROR("trailing whitespace\n" . $herevet); |
1255 | } | 1252 | } |
1253 | |||
1254 | # check we are in a valid source file if not then ignore this hunk | ||
1255 | next if ($realfile !~ /\.(h|c|s|S|pl|sh)$/); | ||
1256 | |||
1256 | #80 column limit | 1257 | #80 column limit |
1257 | if ($line =~ /^\+/ && $prevrawline !~ /\/\*\*/ && | 1258 | if ($line =~ /^\+/ && $prevrawline !~ /\/\*\*/ && |
1258 | $rawline !~ /^.\s*\*\s*\@$Ident\s/ && | 1259 | $rawline !~ /^.\s*\*\s*\@$Ident\s/ && |