diff options
| -rwxr-xr-x | scripts/checkpatch.pl | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index da74e65064d1..31a731e06f50 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl | |||
| @@ -423,11 +423,6 @@ foreach my $entry (@mode_permission_funcs) { | |||
| 423 | $mode_perms_search .= $entry->[0]; | 423 | $mode_perms_search .= $entry->[0]; |
| 424 | } | 424 | } |
| 425 | 425 | ||
| 426 | our $declaration_macros = qr{(?x: | ||
| 427 | (?:$Storage\s+)?(?:DECLARE|DEFINE)_[A-Z]+\s*\(| | ||
| 428 | (?:$Storage\s+)?LIST_HEAD\s*\( | ||
| 429 | )}; | ||
| 430 | |||
| 431 | our $allowed_asm_includes = qr{(?x: | 426 | our $allowed_asm_includes = qr{(?x: |
| 432 | irq| | 427 | irq| |
| 433 | memory | 428 | memory |
| @@ -490,6 +485,12 @@ our $balanced_parens = qr/(\((?:[^\(\)]++|(?-1))*\))/; | |||
| 490 | our $LvalOrFunc = qr{((?:[\&\*]\s*)?$Lval)\s*($balanced_parens{0,1})\s*}; | 485 | our $LvalOrFunc = qr{((?:[\&\*]\s*)?$Lval)\s*($balanced_parens{0,1})\s*}; |
| 491 | our $FuncArg = qr{$Typecast{0,1}($LvalOrFunc|$Constant)}; | 486 | our $FuncArg = qr{$Typecast{0,1}($LvalOrFunc|$Constant)}; |
| 492 | 487 | ||
| 488 | our $declaration_macros = qr{(?x: | ||
| 489 | (?:$Storage\s+)?(?:[A-Z_][A-Z0-9]*_){0,2}(?:DEFINE|DECLARE)(?:_[A-Z0-9]+){1,2}\s*\(| | ||
| 490 | (?:$Storage\s+)?LIST_HEAD\s*\(| | ||
| 491 | (?:$Storage\s+)?${Type}\s+uninitialized_var\s*\( | ||
| 492 | )}; | ||
| 493 | |||
| 493 | sub deparenthesize { | 494 | sub deparenthesize { |
| 494 | my ($string) = @_; | 495 | my ($string) = @_; |
| 495 | return "" if (!defined($string)); | 496 | return "" if (!defined($string)); |
