1 files changed, 43 insertions, 18 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 2287a0bca863..dd2c262aebbf 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -145,7 +145,8 @@ sub list_types {
         close($script);
 
         my @types = ();
-        for ($text =~ /\b(?:(?:CHK|WARN|ERROR)\s*\(\s*"([^"]+)")/g) {
+        # Also catch when type or level is passed through a variable
+        for ($text =~ /(?:(?:\bCHK|\bWARN|\bERROR|&\{\$msg_level})\s*\(|\$msg_type\s*=)\s*"([^"]+)"/g) {
                 push (@types, $_);
         }
         @types = sort(uniq(@types));
@@ -2715,10 +2716,10 @@ sub process {
                                 my $typo_fix = $spelling_fix{lc($typo)};
                                 $typo_fix = ucfirst($typo_fix) if ($typo =~ /^[A-Z]/);
                                 $typo_fix = uc($typo_fix) if ($typo =~ /^[A-Z]+$/);
-                                my $msg_type = \&WARN;
-                                $msg_type = \&CHK if ($file);
-                                if (&{$msg_type}("TYPO_SPELLING",
-                                                 "'$typo' may be misspelled - perhaps '$typo_fix'?\n" . $herecurr) &&
+                                my $msg_level = \&WARN;
+                                $msg_level = \&CHK if ($file);
+                                if (&{$msg_level}("TYPO_SPELLING",
+                                                  "'$typo' may be misspelled - perhaps '$typo_fix'?\n" . $herecurr) &&
                                     $fix) {
                                         $fixed[$fixlinenr] =~ s/(^|[^A-Za-z@])($typo)($|[^A-Za-z@])/$1$typo_fix$3/;
                                 }
@@ -2753,10 +2754,10 @@ sub process {
                     $rawline =~ /\b59\s+Temple\s+Pl/i ||
                     $rawline =~ /\b51\s+Franklin\s+St/i) {
                         my $herevet = "$here\n" . cat_vet($rawline) . "\n";
-                        my $msg_type = \&ERROR;
-                        $msg_type = \&CHK if ($file);
-                        &{$msg_type}("FSF_MAILING_ADDRESS",
-                                     "Do not include the paragraph about writing to the Free Software Foundation's mailing address from the sample GPL notice. The FSF has changed addresses in the past, and may do so again. Linux already includes a copy of the GPL.\n" . $herevet)
+                        my $msg_level = \&ERROR;
+                        $msg_level = \&CHK if ($file);
+                        &{$msg_level}("FSF_MAILING_ADDRESS",
+                                      "Do not include the paragraph about writing to the Free Software Foundation's mailing address from the sample GPL notice. The FSF has changed addresses in the past, and may do so again. Linux already includes a copy of the GPL.\n" . $herevet)
                 }
 
 # check for Kconfig help text having a real description
@@ -2875,7 +2876,7 @@ sub process {
 #       #defines that are a single string
 #
 # There are 3 different line length message types:
-# LONG_LINE_COMMENT     a comment starts before but extends beyond $max_linelength
+# LONG_LINE_COMMENT     a comment starts before but extends beyond $max_line_length
 # LONG_LINE_STRING      a string starts before but extends beyond $max_line_length
 # LONG_LINE             all other lines longer than $max_line_length
 #
@@ -3810,10 +3811,10 @@ sub process {
 
 # avoid BUG() or BUG_ON()
                 if ($line =~ /\b(?:BUG|BUG_ON)\b/) {
-                        my $msg_type = \&WARN;
-                        $msg_type = \&CHK if ($file);
-                        &{$msg_type}("AVOID_BUG",
-                                     "Avoid crashing the kernel - try using WARN_ON & recovery code rather than BUG() or BUG_ON()\n" . $herecurr);
+                        my $msg_level = \&WARN;
+                        $msg_level = \&CHK if ($file);
+                        &{$msg_level}("AVOID_BUG",
+                                      "Avoid crashing the kernel - try using WARN_ON & recovery code rather than BUG() or BUG_ON()\n" . $herecurr);
                 }
 
 # avoid LINUX_VERSION_CODE
@@ -4339,11 +4340,11 @@ sub process {
 
                                         # messages are ERROR, but ?: are CHK
                                         if ($ok == 0) {
-                                                my $msg_type = \&ERROR;
-                                                $msg_type = \&CHK if (($op eq '?:' || $op eq '?' || $op eq ':') && $ctx =~ /VxV/);
+                                                my $msg_level = \&ERROR;
+                                                $msg_level = \&CHK if (($op eq '?:' || $op eq '?' || $op eq ':') && $ctx =~ /VxV/);
 
-                                                if (&{$msg_type}("SPACING",
-                                                                 "spaces required around that '$op' $at\n" . $hereptr)) {
+                                                if (&{$msg_level}("SPACING",
+                                                                  "spaces required around that '$op' $at\n" . $hereptr)) {
                                                         $good = rtrim($fix_elements[$n]) . " " . trim($fix_elements[$n + 1]) . " ";
                                                         if (defined $fix_elements[$n + 2]) {
                                                                 $fix_elements[$n + 2] =~ s/^\s+//;
@@ -4496,6 +4497,30 @@ sub process {
                         }
                 }
 
+# check for unnecessary parentheses around comparisons in if uses
+                if ($^V && $^V ge 5.10.0 && defined($stat) &&
+                    $stat =~ /(^.\s*if\s*($balanced_parens))/) {
+                        my $if_stat = $1;
+                        my $test = substr($2, 1, -1);
+                        my $herectx;
+                        while ($test =~ /(?:^|[^\w\&\!\~])+\s*\(\s*([\&\!\~]?\s*$Lval\s*(?:$Compare\s*$FuncArg)?)\s*\)/g) {
+                                my $match = $1;
+                                # avoid parentheses around potential macro args
+                                next if ($match =~ /^\s*\w+\s*$/);
+                                if (!defined($herectx)) {
+                                        $herectx = $here . "\n";
+                                        my $cnt = statement_rawlines($if_stat);
+                                        for (my $n = 0; $n < $cnt; $n++) {
+                                                my $rl = raw_line($linenr, $n);
+                                                $herectx .=  $rl . "\n";
+                                                last if $rl =~ /^[ \+].*\{/;
+                                        }
+                                }
+                                CHK("UNNECESSARY_PARENTHESES",
+                                    "Unnecessary parentheses around '$match'\n" . $herectx);
+                        }
+                }
+
 #goto labels aren't indented, allow a single space however
                 if ($line=~/^.\s+[A-Za-z\d_]+:(?![0-9]+)/ and
                    !($line=~/^. [A-Za-z\d_]+:/) and !($line=~/^.\s+default:/)) {