1 files changed, 9 insertions, 1 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 3e4099a6df51..9a3894dbf752 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -189,6 +189,14 @@ our $typeTypedefs = qr{(?x:
         atomic_t
 )};
 
+our $logFunctions = qr{(?x:
+        printk|
+        pr_(debug|dbg|vdbg|devel|info|warning|err|notice|alert|crit|emerg|cont)|
+        dev_(printk|dbg|vdbg|info|warn|err|notice|alert|crit|emerg|WARN)|
+        WARN|
+        panic
+)};
+
 our @typeList = (
         qr{void},
         qr{(?:unsigned\s+)?char},
@@ -1377,7 +1385,7 @@ sub process {
 #80 column limit
                 if ($line =~ /^\+/ && $prevrawline !~ /\/\*\*/ &&
                     $rawline !~ /^.\s*\*\s*\@$Ident\s/ &&
-                    $line !~ /^\+\s*printk\s*\(\s*(?:KERN_\S+\s*)?"[X\t]*"\s*(?:,|\)\s*;)\s*$/ &&
+                    $line !~ /^\+\s*$logFunctions\s*\(\s*(?:KERN_\S+\s*)?"[X\t]*"\s*(?:,|\)\s*;)\s*$/ &&
                     $length > 80)
                 {
                         WARN("line over 80 characters\n" . $herecurr);