diff options
| author | Andy Whitcroft | 2012-01-11 00:10:08 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2012-01-11 01:30:51 +0100 |
| commit | e01886ada28741d7cb2cfb3224e9caccfbc1a2d5 (patch) | |
| tree | ba401dddad6fffc2dc079e1449f20c2091195a41 | |
| parent | checkpatch: complex macro should allow the empty do while loop (diff) | |
| download | kernel-qcow2-linux-e01886ada28741d7cb2cfb3224e9caccfbc1a2d5.tar.gz kernel-qcow2-linux-e01886ada28741d7cb2cfb3224e9caccfbc1a2d5.tar.xz kernel-qcow2-linux-e01886ada28741d7cb2cfb3224e9caccfbc1a2d5.zip | |
checkpatch: fix 'return is not a function' square bracket handling
We are incorrectly matching square brackets '[' and ']' leading to false
positives on more complex functions as below:
return (dt3155_fbuffer[m]->ready_head -
dt3155_fbuffer[m]->ready_len +
dt3155_fbuffer[m]->nbuffers)%
(dt3155_fbuffer[m]->nbuffers);
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>
| -rwxr-xr-x | scripts/checkpatch.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index ca6d0fb229f2..5e3f4191f959 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2609,7 +2609,7 @@ sub process { # Flatten any parentheses $value =~ s/\(/ \(/g; $value =~ s/\)/\) /g; - while ($value =~ s/\[[^\{\}]*\]/1/ || + while ($value =~ s/\[[^\[\]]*\]/1/ || $value !~ /(?:$Ident|-?$Constant)\s* $Compare\s* (?:$Ident|-?$Constant)/x && |