From f5a6d1675036fbef5a0e716e48ad20b4ccbd41a1 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Fri, 5 Mar 2010 13:43:51 -0800
Subject: [PATCH] --- yaml --- r: 186302 b: refs/heads/master c:
 691e669ba8c64d31ac08d87b1751e6acfa3ff65e h: refs/heads/master v: v3

---
 [refs]                      |  2 +-
 trunk/scripts/checkpatch.pl | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0121ca44970b..d2d003af65ae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42bdf74c95b6935f3c09a09ba4bead6cad11b540
+refs/heads/master: 691e669ba8c64d31ac08d87b1751e6acfa3ff65e
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
index 3e4099a6df51..9a3894dbf752 100755
--- a/trunk/scripts/checkpatch.pl
+++ b/trunk/scripts/checkpatch.pl
@@ -189,6 +189,14 @@ sub help {
 	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);