Commit e45bab8e authored Mar 23, 2012 by Andy Whitcroft Committed by Linus Torvalds Mar 23, 2012

checkpatch: handle string concatenation in simple #defines



Adjacent strings indicate concatentation, therefore look at identifiers
directly adjacent to literal strings as strings too.  This allows us to
better detect the form below and accept it as a simple constant:

    #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

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

parent b9df76ac

scripts/checkpatch.pl

+6 −0

Original line number	Diff line number	Diff line
		@@ -2894,6 +2894,12 @@ sub process {
		{
		}

		# Flatten any obvious string concatentation.
		while ($dstat =~ s/("X")\s$Ident/$1/ \|\|
		$dstat =~ s/$Ident\s("X")/$1/)
		{
		}

		my $exceptions = qr{
		$Declare\|
		module_param_named\|