[PATCH] checkpatch: fix for stripping brackets from macros.

[Jeremy Sowden]

When checking macros, checkpatch.pl strips parentheses, square brackets
and braces.  However, the search-and-replace expression was not correct,
and instead of replacing the brackets and their contents with just the
contents, it was replacing them with literal 1's.

Signed-off-by: Jeremy Sowden <jeremy@xxxxxxxxxx>
---
 scripts/checkpatch.pl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 168687ae24fa..3b67646df845 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -4874,9 +4874,9 @@ sub process {
 			$dstat =~ s/\s*$//s;
 
 			# Flatten any parentheses and braces
-			while ($dstat =~ s/\([^\(\)]*\)/1/ ||
-			       $dstat =~ s/\{[^\{\}]*\}/1/ ||
-			       $dstat =~ s/.\[[^\[\]]*\]/1/)
+			while ($dstat =~ s/\(([^\(\)]*)\)/$1/ ||
+			       $dstat =~ s/\{([^\{\}]*)\}/$1/ ||
+			       $dstat =~ s/.\[([^\[\]]*)\]/$1/)
 			{
 			}
 

base-commit: 53600ecfb6004f355bd3551bee180caf4b42d7a7
-- 
2.15.1