The patch titled Subject: checkpatch: improve MULTISTATEMENT_MACRO_USE_DO_WHILE test has been added to the -mm tree. Its filename is checkpatch-improve-multistatement_macro_use_do_while-test.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/checkpatch-improve-multistatement_macro_use_do_while-test.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/checkpatch-improve-multistatement_macro_use_do_while-test.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Joe Perches <joe@xxxxxxxxxxx> Subject: checkpatch: improve MULTISTATEMENT_MACRO_USE_DO_WHILE test The logic currrently misses macros that start with an if statement. e.g.: #define foo(bar) if (bar) baz; Add a test for macro content that starts with if Original-patch-by: Alfonso Lima <alfonsolimaastor@xxxxxxxxx> Link: http://lkml.kernel.org/r/a9d41aafe1673889caf1a9850208fb7fd74107a0.1491783914.git.joe@xxxxxxxxxxx Signed-off-by: Joe Perches <joe@xxxxxxxxxxx> Reported-by: Andreas Mohr <andi@xxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- scripts/checkpatch.pl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff -puN scripts/checkpatch.pl~checkpatch-improve-multistatement_macro_use_do_while-test scripts/checkpatch.pl --- a/scripts/checkpatch.pl~checkpatch-improve-multistatement_macro_use_do_while-test +++ a/scripts/checkpatch.pl @@ -4849,8 +4849,10 @@ sub process { $dstat !~ /^\(\{/ && # ({... $ctx !~ /^.\s*#\s*define\s+TRACE_(?:SYSTEM|INCLUDE_FILE|INCLUDE_PATH)\b/) { - - if ($dstat =~ /;/) { + if ($dstat =~ /^\s*if\b/) { + ERROR("MULTISTATEMENT_MACRO_USE_DO_WHILE", + "Macros starting with if should be enclosed by a do - while loop to avoid possible if/else logic defects\n" . "$herectx"); + } elsif ($dstat =~ /;/) { ERROR("MULTISTATEMENT_MACRO_USE_DO_WHILE", "Macros with multiple statements should be enclosed in a do - while loop\n" . "$herectx"); } else { _ Patches currently in -mm which might be from joe@xxxxxxxxxxx are checkpatch-add-ability-to-find-bad-uses-of-vsprintf-%pfoo-extensions.patch checkpatch-improve-embedded_function_name-test.patch checkpatch-allow-space-leading-blank-lines-in-email-headers.patch checkpatch-avoid-suggesting-struct-definitions-should-be-const.patch checkpatch-improve-multistatement_macro_use_do_while-test.patch treewide-correct-diffrent-and-banlance-typos.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html