Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 326b1ffc136d944d403a2b44dc3abace2a4e10fd

Authored by Joe Perches
Committed by Linus Torvalds
1 parent 91c777d867
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

checkpatch: fix $Float creation of match variables 

Commit 74349bccedb3 ("checkpatch: add support for floating point
constants") added an unnecessary match variable that caused tests that
used a $Constant or $LvalOrFunc to have one too many matches.

This causes problems with usleep_range, min/max and other extended
tests.

Avoid using match variables in $Float.
Avoid using match variables in $Assignment too.

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

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

scripts/checkpatch.pl
Diff comments   View file @ 326b1ff
... ... @@ -230,12 +230,12 @@
230 230 our $Member = qr{->$Ident|\.$Ident|\[[^]]*\]};
231 231 our $Lval = qr{$Ident(?:$Member)*};
232 232  
233   -our $Float_hex = qr{(?i:0x[0-9a-f]+p-?[0-9]+[fl]?)};
234   -our $Float_dec = qr{(?i:((?:[0-9]+\.[0-9]*|[0-9]*\.[0-9]+)(?:e-?[0-9]+)?[fl]?))};
235   -our $Float_int = qr{(?i:[0-9]+e-?[0-9]+[fl]?)};
  233 +our $Float_hex = qr{(?i)0x[0-9a-f]+p-?[0-9]+[fl]?};
  234 +our $Float_dec = qr{(?i)(?:[0-9]+\.[0-9]*|[0-9]*\.[0-9]+)(?:e-?[0-9]+)?[fl]?};
  235 +our $Float_int = qr{(?i)[0-9]+e-?[0-9]+[fl]?};
236 236 our $Float = qr{$Float_hex|$Float_dec|$Float_int};
237   -our $Constant = qr{(?:$Float|(?i:(?:0x[0-9a-f]+|[0-9]+)[ul]*))};
238   -our $Assignment = qr{(?:\*\=|/=|%=|\+=|-=|<<=|>>=|&=|\^=|\|=|=)};
  237 +our $Constant = qr{$Float|(?i)(?:0x[0-9a-f]+|[0-9]+)[ul]*};
  238 +our $Assignment = qr{\*\=|/=|%=|\+=|-=|<<=|>>=|&=|\^=|\|=|=};
239 239 our $Compare = qr{<=|>=|==|!=|<|>};
240 240 our $Operators = qr{
241 241 <=|>=|==|!=|