Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit bfcb2cc798a14230d22b6dd999e2e680623de622

Authored by Andy Whitcroft
Committed by Linus Torvalds
1 parent 6b48db24e3
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

checkpatch: catch all occurences of type and cast spacing errors per line 

Fix up type and cast spacing checks such that all occurences on a line are
examined and reported.  For example the line below has a valid cast and a
bad type, but currently we check the cast first which is good and stop:

    u16* bar = (u16 *)baz;

We will also only report one of the errors in this example:

    u16* bar = (u16*)bad;

Move to iterating across all casts and all types, reporting any failure.

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 7 additions and 4 deletions Side-by-side Diff

scripts/checkpatch.pl
Diff comments   View file @ bfcb2cc
... ... @@ -2209,8 +2209,9 @@
2209 2209  
2210 2210 # * goes on variable not on type
2211 2211 # (char*[ const])
2212   - if ($line =~ m{\($NonptrType(\s*(?:$Modifier\b\s*|\*\s*)+)\)}) {
2213   - my ($from, $to) = ($1, $1);
  2212 + while ($line =~ m{(\($NonptrType(\s*(?:$Modifier\b\s*|\*\s*)+)\))}g) {
  2213 + #print "AA<$1>\n";
  2214 + my ($from, $to) = ($2, $2);
2214 2215  
2215 2216 # Should start with a space.
2216 2217 $to =~ s/^(\S)/ $1/;
... ... @@ -2225,8 +2226,10 @@
2225 2226 ERROR("POINTER_LOCATION",
2226 2227 "\"(foo$from)\" should be \"(foo$to)\"\n" . $herecurr);
2227 2228 }
2228   - } elsif ($line =~ m{\b$NonptrType(\s*(?:$Modifier\b\s*|\*\s*)+)($Ident)}) {
2229   - my ($from, $to, $ident) = ($1, $1, $2);
  2229 + }
  2230 + while ($line =~ m{(\b$NonptrType(\s*(?:$Modifier\b\s*|\*\s*)+)($Ident))}g) {
  2231 + #print "BB<$1>\n";
  2232 + my ($from, $to, $ident) = ($2, $2, $3);
2230 2233  
2231 2234 # Should start with a space.
2232 2235 $to =~ s/^(\S)/ $1/;