summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Whitcroft <apw@canonical.com>2012-01-10 15:10:06 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-10 16:30:51 -0800
commit72f115f94d500fc72f78c5df8104a98f8b9cc273 (patch)
tree3c6b37bebd9b1f1671df4f8d0dcbe0f625b4a6a0
parent87a53877185627b49a903023255425bda78f890c (diff)
downloadlinux-72f115f94d500fc72f78c5df8104a98f8b9cc273.tar.gz
linux-72f115f94d500fc72f78c5df8104a98f8b9cc273.tar.bz2
linux-72f115f94d500fc72f78c5df8104a98f8b9cc273.zip
checkpatch: complex macro should allow the empty do while loop
It is common to stub out a function as below, this is triggering a complex macro format incorrectly. Sort this out: #define cma_early_regions_reserve(reserve) do { } while (0) 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>
-rwxr-xr-xscripts/checkpatch.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index afc656d00589..ca6d0fb229f2 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2838,7 +2838,7 @@ sub process {
$dstat !~ /^(?:$Ident|-?$Constant)$/ && # 10 // foo()
$dstat !~ /$exceptions/ &&
$dstat !~ /^\.$Ident\s*=/ && # .foo =
- $dstat !~ /^do\s*$Constant\s*while\s*$Constant;$/ && # do {...} while (...);
+ $dstat !~ /^do\s*$Constant\s*while\s*$Constant;?$/ && # do {...} while (...); // do {...} while (...)
$dstat !~ /^for\s*$Constant$/ && # for (...)
$dstat !~ /^for\s*$Constant\s+(?:$Ident|-?$Constant)$/ && # for (...) bar()
$dstat !~ /^do\s*{/ && # do {...