1 files changed, 4 insertions, 22 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 8dce8a8d9ed0..2a8c6c3c1bdb 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -3829,28 +3829,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]+)/) {