Commit 63f17f89 authored by Andy Whitcroft's avatar Andy Whitcroft Committed by Linus Torvalds
Browse files

checkpatch: allow parentheses on return handle array values 



When we allow return to have surrounding parentheses when containing
comparison operators we are not correctly handling the case where the
values contain array sufffixes.  Squash them.

Signed-off-by: default avatarAndy Whitcroft <apw@canonical.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f9a0b3d1

scripts/checkpatch.pl

+5 −1
Original line number Diff line number Diff line
@@ -2016,7 +2016,11 @@ sub process { 


			# Flatten any parentheses

			$value =~ s/\)\(/\) \(/g;

			while ($value !~ /(?:$Ident|-?$Constant)\s*$Compare\s*(?:$Ident|-?$Constant)/ && $value =~ s/\([^\(\)]*\)/1/) {

			while ($value =~ s/\[[^\{\}]*\]/1/ ||

			       $value !~ /(?:$Ident|-?$Constant)\s*

					     $Compare\s*

					     (?:$Ident|-?$Constant)/x &&

			       $value =~ s/\([^\(\)]*\)/1/) {

			}



			if ($value =~ /^(?:$Ident|-?$Constant)$/) {