Commit 0fccc622 authored May 24, 2011 by Joe Perches Committed by Linus Torvalds May 25, 2011

checkpatch: fix defect in printk(KERN_<LEVEL> 80 column exceptions



Currently, printk lines with a only KERN_PREFIX and a quoted string
without a comma or close paren that exceed 80 columns are flagged with a
warning.

ie:
	printk(KERN_WARNING "some long string that extends beond 80 cols..."
	       "and is continued on another line\n");

Allow this form instead of emitting a warning.

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

parent b0531722

scripts/checkpatch.pl

+1 −1

Original line number	Diff line number	Diff line
		@@ -1462,7 +1462,7 @@ sub process {
		#80 column limit
		if ($line =~ /^\+/ && $prevrawline !~ /\/\\/ &&
		$rawline !~ /^.\s\\s*\@$Ident\s/ &&
		!($line =~ /^\+\s$logFunctions\s$\s(?:(KERN_\S+\s\|[^"]))?"[X\t]"\s(?:,\|$\s;)\s*$/ \|\|
		!($line =~ /^\+\s$logFunctions\s$\s(?:(KERN_\S+\s\|[^"]))?"[X\t]"\s(?:\|,\|$\s;)\s*$/ \|\|
		$line =~ /^\+\s"[^"]"\s(?:\s\|,\|\)\s;)\s$/) &&
		$length > 80)
		{

Admin message