diff options
| author | Andy Whitcroft <apw@canonical.com> | 2009-01-06 14:41:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 15:59:16 -0800 |
| commit | 86f9d059c6bc548f6337f01117897a4c823cb4ee (patch) | |
| tree | f7861404c3e84268a890f1cc3517bebaaa5bc49b /scripts | |
| parent | 1e85572697b348b1a126520349a29654f2ae6a12 (diff) | |
| download | linux-stable-86f9d059c6bc548f6337f01117897a4c823cb4ee.tar.gz linux-stable-86f9d059c6bc548f6337f01117897a4c823cb4ee.tar.bz2 linux-stable-86f9d059c6bc548f6337f01117897a4c823cb4ee.zip | |
checkpatch: allow parentheses on return for comparisons
It seems to be a common idiom to include braces on conditionals in all
contexts including return. Allow this exception to the return is not a
function checks. Reported by Kay Sievers.
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Andy Whitcroft <apw@canonical.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-x | scripts/checkpatch.pl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index b953c76be369..5c7fd1a4f930 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -127,6 +127,7 @@ our $Lval = qr{$Ident(?:$Member)*}; our $Constant = qr{(?:[0-9]+|0x[0-9a-fA-F]+)[UL]*}; our $Assignment = qr{(?:\*\=|/=|%=|\+=|-=|<<=|>>=|&=|\^=|\|=|=)}; +our $Compare = qr{<=|>=|==|!=|<|>}; our $Operators = qr{ <=|>=|==|!=| =>|->|<<|>>|<|>|!|~| @@ -1983,9 +1984,9 @@ sub process { my $spacing = $1; my $value = $2; - # Flatten any parentheses and braces + # Flatten any parentheses $value =~ s/\)\(/\) \(/g; - while ($value =~ s/\([^\(\)]*\)/1/) { + while ($value !~ /(?:$Ident|-?$Constant)\s*$Compare\s*(?:$Ident|-?$Constant)/ && $value =~ s/\([^\(\)]*\)/1/) { } if ($value =~ /^(?:$Ident|-?$Constant)$/) { |