[PATCH V3] checkpatch: Improve MULTISTATEMENT_MACRO_USE_DO_WHILE test

[Joe Perches]

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>
Reported-by: Andreas Mohr <andi@xxxxxxxx>
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
---

V3: Fix bad merge - Add missing closing brace
V2: V1 was done incorrectly against a much older version of checkpatch
    and so rolled back several improvements.
    I forgot I had used git checkout <commit_id> -- scripts/checkpatch.pl
    and then edited that.

 scripts/checkpatch.pl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index e8d8481b24c8..0a26f8ada9f9 100755
--- a/scripts/checkpatch.pl
+++ b/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 {
-- 
2.10.0.rc2.1.g053435c