aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorAndy Whitcroft <apw@canonical.com>2009-01-06 17:41:24 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-06 18:59:16 -0500
commit86f9d059c6bc548f6337f01117897a4c823cb4ee (patch)
treef7861404c3e84268a890f1cc3517bebaaa5bc49b /scripts
parent1e85572697b348b1a126520349a29654f2ae6a12 (diff)
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-xscripts/checkpatch.pl5
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index b953c76be36..5c7fd1a4f93 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -127,6 +127,7 @@ our $Lval = qr{$Ident(?:$Member)*};
127 127
128our $Constant = qr{(?:[0-9]+|0x[0-9a-fA-F]+)[UL]*}; 128our $Constant = qr{(?:[0-9]+|0x[0-9a-fA-F]+)[UL]*};
129our $Assignment = qr{(?:\*\=|/=|%=|\+=|-=|<<=|>>=|&=|\^=|\|=|=)}; 129our $Assignment = qr{(?:\*\=|/=|%=|\+=|-=|<<=|>>=|&=|\^=|\|=|=)};
130our $Compare = qr{<=|>=|==|!=|<|>};
130our $Operators = qr{ 131our $Operators = qr{
131 <=|>=|==|!=| 132 <=|>=|==|!=|
132 =>|->|<<|>>|<|>|!|~| 133 =>|->|<<|>>|<|>|!|~|
@@ -1983,9 +1984,9 @@ sub process {
1983 my $spacing = $1; 1984 my $spacing = $1;
1984 my $value = $2; 1985 my $value = $2;
1985 1986
1986 # Flatten any parentheses and braces 1987 # Flatten any parentheses
1987 $value =~ s/\)\(/\) \(/g; 1988 $value =~ s/\)\(/\) \(/g;
1988 while ($value =~ s/\([^\(\)]*\)/1/) { 1989 while ($value !~ /(?:$Ident|-?$Constant)\s*$Compare\s*(?:$Ident|-?$Constant)/ && $value =~ s/\([^\(\)]*\)/1/) {
1989 } 1990 }
1990 1991
1991 if ($value =~ /^(?:$Ident|-?$Constant)$/) { 1992 if ($value =~ /^(?:$Ident|-?$Constant)$/) {