From: 黄涛 <huangtao@rock-chips.com>
Date: Fri, 4 Jul 2014 04:59:57 +0000 (+0800)
Subject: scripts/checkpatch.pl: update to b43ae21bd1d8199df10548f3fc0d806052027f29 and enable... 
X-Git-Tag: firefly_0821_release~4998
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=06b2951ab69e953bcadd622a05b61275df4c8a53;p=firefly-linux-kernel-4.4.55.git

scripts/checkpatch.pl: update to b43ae21bd1d8199df10548f3fc0d806052027f29 and enable strict default
---

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 010b18ef4ea0..ca5032393998 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -23,7 +23,7 @@ my $tst_only;
 my $emacs = 0;
 my $terse = 0;
 my $file = 0;
-my $check = 0;
+my $check = 1;
 my $check_orig = 0;
 my $summary = 1;
 my $mailback = 0;
@@ -3476,12 +3476,17 @@ sub process {
 			}
 		}
 
-# unnecessary return in a void function? (a single leading tab, then return;)
-		if ($sline =~ /^\+\treturn\s*;\s*$/ &&
-		    $prevline =~ /^\+/) {
+# unnecessary return in a void function
+# at end-of-function, with the previous line a single leading tab, then return;
+# and the line before that not a goto label target like "out:"
+		if ($sline =~ /^[ \+]}\s*$/ &&
+		    $prevline =~ /^\+\treturn\s*;\s*$/ &&
+		    $linenr >= 3 &&
+		    $lines[$linenr - 3] =~ /^[ +]/ &&
+		    $lines[$linenr - 3] !~ /^[ +]\s*$Ident\s*:/) {
 			WARN("RETURN_VOID",
-			     "void function return statements are not generally useful\n" . $herecurr);
-		}
+			     "void function return statements are not generally useful\n" . $hereprev);
+               }
 
 # if statements using unnecessary parentheses - ie: if ((foo == bar))
 		if ($^V && $^V ge 5.10.0 &&