Merge branch 'soc-fixes' into omap-for-v4.15/fixes

1 files changed, 18 insertions, 27 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index dd2c262aebbf..95cda3ecc66b 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -454,6 +454,7 @@ our $zero_initializer = qr{(?:(?:0[xX])?0+$Int_type?|NULL|false)\b};
 our $logFunctions = qr{(?x:
         printk(?:_ratelimited|_once|_deferred_once|_deferred|)|
         (?:[a-z0-9]+_){1,2}(?:printk|emerg|alert|crit|err|warning|warn|notice|info|debug|dbg|vdbg|devel|cont|WARN)(?:_ratelimited|_once|)|
+        TP_printk|
         WARN(?:_RATELIMIT|_ONCE|)|
         panic|
         MODULE_[A-Z_]+|
@@ -2900,8 +2901,9 @@ sub process {
                                  $line =~ /^\+\s*#\s*define\s+\w+\s+$String$/) {
                                 $msg_type = "";
 
-                        # EFI_GUID is another special case
-                        } elsif ($line =~ /^\+.*\bEFI_GUID\s*\(/) {
+                        # More special cases
+                        } elsif ($line =~ /^\+.*\bEFI_GUID\s*\(/ ||
+                                 $line =~ /^\+\s*(?:\w+)?\s*DEFINE_PER_CPU/) {
                                 $msg_type = "";
 
                         # Otherwise set the alternate message types
@@ -3103,6 +3105,7 @@ sub process {
                       $line =~ /^\+[a-z_]*init/ ||
                       $line =~ /^\+\s*(?:static\s+)?[A-Z_]*ATTR/ ||
                       $line =~ /^\+\s*DECLARE/ ||
+                      $line =~ /^\+\s*builtin_[\w_]*driver/ ||
                       $line =~ /^\+\s*__setup/)) {
                         if (CHK("LINE_SPACING",
                                 "Please use a blank line after function/struct/union/enum declarations\n" . $hereprev) &&
@@ -3182,6 +3185,12 @@ sub process {
 # check we are in a valid C source file if not then ignore this hunk
                 next if ($realfile !~ /\.(h|c)$/);
 
+# check for unusual line ending [ or (
+                if ($line =~ /^\+.*([\[\(])\s*$/) {
+                        CHK("OPEN_ENDED_LINE",
+                            "Lines should not end with a '$1'\n" . $herecurr);
+                }
+
 # check if this appears to be the start function declaration, save the name
                 if ($sline =~ /^\+\{\s*$/ &&
                     $prevline =~ /^\+(?:(?:(?:$Storage|$Inline)\s*)*\s*$Type\s*)?($Ident)\(/) {
@@ -3829,28 +3838,10 @@ sub process {
                              "Prefer printk_ratelimited or pr_<level>_ratelimited to printk_ratelimit\n" . $herecurr);
                 }
 
-# printk should use KERN_* levels.  Note that follow on printk's on the
-# same line do not need a level, so we use the current block context
-# to try and find and validate the current printk.  In summary the current
-# printk includes all preceding printk's which have no newline on the end.
-# we assume the first bad printk is the one to report.
-                if ($line =~ /\bprintk\((?!KERN_)\s*"/) {
-                        my $ok = 0;
-                        for (my $ln = $linenr - 1; $ln >= $first_line; $ln--) {
-                                #print "CHECK<$lines[$ln - 1]\n";
-                                # we have a preceding printk if it ends
-                                # with "\n" ignore it, else it is to blame
-                                if ($lines[$ln - 1] =~ m{\bprintk\(}) {
-                                        if ($rawlines[$ln - 1] !~ m{\\n"}) {
-                                                $ok = 1;
-                                        }
-                                        last;
-                                }
-                        }
-                        if ($ok == 0) {
-                                WARN("PRINTK_WITHOUT_KERN_LEVEL",
-                                     "printk() should include KERN_ facility level\n" . $herecurr);
-                        }
+# printk should use KERN_* levels
+                if ($line =~ /\bprintk\s*\(\s*(?!KERN_[A-Z]+\b)/) {
+                        WARN("PRINTK_WITHOUT_KERN_LEVEL",
+                             "printk() should include KERN_<LEVEL> facility level\n" . $herecurr);
                 }
 
                 if ($line =~ /\bprintk\s*\(\s*KERN_([A-Z]+)/) {
@@ -5957,7 +5948,7 @@ sub process {
 
 # check for function declarations that have arguments without identifier names
                 if (defined $stat &&
-                    $stat =~ /^.\s*(?:extern\s+)?$Type\s*$Ident\s*\(\s*([^{]+)\s*\)\s*;/s &&
+                    $stat =~ /^.\s*(?:extern\s+)?$Type\s*(?:$Ident|\(\s*\*\s*$Ident\s*\))\s*\(\s*([^{]+)\s*\)\s*;/s &&
                     $1 ne "void") {
                         my $args = trim($1);
                         while ($args =~ m/\s*($Type\s*(?:$Ident|\(\s*\*\s*$Ident?\s*\)\s*$balanced_parens)?)/g) {
@@ -6109,7 +6100,7 @@ sub process {
                                 next if ($fline =~ /^.[\s$;]*$/);
                                 $has_statement = 1;
                                 $count++;
-                                $has_break = 1 if ($fline =~ /\bswitch\b|\b(?:break\s*;[\s$;]*$|return\b|goto\b|continue\b)/);
+                                $has_break = 1 if ($fline =~ /\bswitch\b|\b(?:break\s*;[\s$;]*$|exit\s*\(\b|return\b|goto\b|continue\b)/);
                         }
                         if (!$has_break && $has_statement) {
                                 WARN("MISSING_BREAK",
@@ -6390,7 +6381,7 @@ sub process {
                 exit(0);
         }
 
-        if (!$is_patch && $file !~ /cover-letter\.patch$/) {
+        if (!$is_patch && $filename !~ /cover-letter\.patch$/) {
                 ERROR("NOT_UNIFIED_DIFF",
                       "Does not appear to be a unified-diff format patch\n");
         }