diff options
| author |   Andy Whitcroft <apw@canonical.com> | 2012-03-23 15:02:18 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-23 16:58:36 -0700 |
| commit | e45bab8ebfee65ba89b228c1e7c64a6cb0812124 (patch) | |
| tree | fe61be22fa4438d5bd132712e730daca9cbf341b /scripts | |
| parent | checkpatch: allow simple character constants in #defines (diff) | |
| download | linux-dev-e45bab8ebfee65ba89b228c1e7c64a6cb0812124.tar.xz linux-dev-e45bab8ebfee65ba89b228c1e7c64a6cb0812124.zip | |
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>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/checkpatch.pl | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 95ba30a24dcf..01a65988a057 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -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| |