Commit 6e60c02e authored Jul 25, 2011 by Joe Perches Committed by Linus Torvalds Jul 25, 2011

checkpatch.pl: update $logFunctions



Previous behavior allowed only alphabetic prefixes like pr_info to exceed
the 80 column line length limit.

ath6kl wants to add a digit into the prefix, so allow numbers as well as
digits in the <prefix>_<level> printks.

<prefix>_<level>_ratelimited and <prefix>_<level>_once and WARN_RATELIMIT
and WARN_ONCE may now exceed 80 cols.

Add missing <prefix>_printk type for completeness.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Andy Whitcroft <apw@canonical.com>
Cc: Kalle Valo <kvalo@qca.qualcomm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 34d99219

scripts/checkpatch.pl

+3 −3

Original line number	Diff line number	Diff line
		@@ -257,9 +257,9 @@ our $typeTypedefs = qr{(?x:
		)};

		our $logFunctions = qr{(?x:
		printk\|
		[a-z]+_(emerg\|alert\|crit\|err\|warning\|warn\|notice\|info\|debug\|dbg\|vdbg\|devel\|cont\|WARN)\|
		WARN\|
		printk(?:_ratelimited\|_once\|)\|
		[a-z0-9]+_(?:printk\|emerg\|alert\|crit\|err\|warning\|warn\|notice\|info\|debug\|dbg\|vdbg\|devel\|cont\|WARN)(?:_ratelimited\|_once\|)\|
		WARN(?:_RATELIMIT\|_ONCE\|)\|
		panic\|
		MODULE_[A-Z_]+
		)};

Admin message