From: Joe Perches <joe@perches.com>
Date: Wed, 19 Jun 2013 00:07:20 +0000 (+1000)
Subject: checkpatch: don't warn on blank lines before/after braces as often
X-Git-Tag: next-20130619~2^2~280
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=72a1287c3daa2039669a4baf7654cd2ddb58f1cb;p=karo-tx-linux.git

checkpatch: don't warn on blank lines before/after braces as often

Check to make sure the blank lines aren't comment lines like:

bool foo(bool bar)
{
	/* Don't warn on a leading comment */
	return !bar;
	/* Don't warn on a trailing comment either */
}

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 4ad40523b419..c43be815cc71 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -3258,11 +3258,11 @@ sub process {
 		}
 
 # check for unnecessary blank lines around braces
-		if (($line =~ /^.\s*}\s*$/ && $prevline =~ /^.\s*$/)) {
+		if (($line =~ /^.\s*}\s*$/ && $prevrawline =~ /^.\s*$/)) {
 			CHK("BRACES",
 			    "Blank lines aren't necessary before a close brace '}'\n" . $hereprev);
 		}
-		if (($line =~ /^.\s*$/ && $prevline =~ /^..*{\s*$/)) {
+		if (($rawline =~ /^.\s*$/ && $prevline =~ /^..*{\s*$/)) {
 			CHK("BRACES",
 			    "Blank lines aren't necessary after an open brace '{'\n" . $hereprev);
 		}