[PATCH 1/4] staging: unisys: remove do{} while(0) in channel.h

Benjamin Romer benjamin.romer at unisys.com
Mon Aug 18 13:21:43 UTC 2014


The CHANNEL_*_MISMATCH error message macros should not be inside of do blocks.

Signed-off-by: Benjamin Romer <benjamin.romer at unisys.com>
---
 .../staging/unisys/common-spar/include/channels/channel.h    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/unisys/common-spar/include/channels/channel.h b/drivers/staging/unisys/common-spar/include/channels/channel.h
index 2004cfe..c9f0427 100644
--- a/drivers/staging/unisys/common-spar/include/channels/channel.h
+++ b/drivers/staging/unisys/common-spar/include/channels/channel.h
@@ -52,30 +52,30 @@
 
 #define CHANNEL_GUID_MISMATCH(chType, chName, field, expected, actual, fil, \
 			      lin, logCtx)				\
-	do {								\
+	{								\
 		pr_err("Channel mismatch on channel=%s(%pUL) field=%s expected=%pUL actual=%pUL @%s:%d\n", \
 		       chName, &chType, field,	\
 		       &expected, &actual, \
 		       fil, lin);					\
-	} while (0)
+	}
 #define CHANNEL_U32_MISMATCH(chType, chName, field, expected, actual, fil, \
 			     lin, logCtx)				\
-	do {								\
+	{								\
 		pr_err("Channel mismatch on channel=%s(%pUL) field=%s expected=0x%-8.8lx actual=0x%-8.8lx @%s:%d\n", \
 		       chName, &chType, field,	\
 		       (unsigned long)expected, (unsigned long)actual,	\
 		       fil, lin);					\
-	} while (0)
+	}
 
 #define CHANNEL_U64_MISMATCH(chType, chName, field, expected, actual, fil, \
 			     lin, logCtx)				\
-	do {								\
+	{								\
 		pr_err("Channel mismatch on channel=%s(%pUL) field=%s expected=0x%-8.8Lx actual=0x%-8.8Lx @%s:%d\n", \
 		       chName, &chType, field,	\
 		       (unsigned long long)expected,			\
 		       (unsigned long long)actual,			\
 		       fil, lin);					\
-	} while (0)
+	}
 
 #define UltraLogEvent(logCtx, EventId, Severity, SubsystemMask, pFunctionName, \
 		      LineNumber, Str, args...)				\
-- 
1.9.1



More information about the devel mailing list