From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id DA8E91C2D3B for ; Tue, 5 Aug 2014 18:59:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D5C8A2FC24 for ; Tue, 5 Aug 2014 18:59:06 +0000 (UTC) Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 71m+V1c-hwQF for ; Tue, 5 Aug 2014 18:59:06 +0000 (UTC) Received: from mail1.bemta12.messagelabs.com (mail1.bemta12.messagelabs.com [216.82.251.12]) by silver.osuosl.org (Postfix) with ESMTPS id 22BFF32A90 for ; Tue, 5 Aug 2014 18:59:06 +0000 (UTC) From: Benjamin Romer Subject: [PATCH 11/14] staging: unisys: remove do{} while(0) in macros in channel.h Date: Tue, 5 Aug 2014 14:57:55 -0400 Message-ID: <1407265078-21691-12-git-send-email-benjamin.romer@unisys.com> In-Reply-To: <1407265078-21691-1-git-send-email-benjamin.romer@unisys.com> References: <1407265078-21691-1-git-send-email-benjamin.romer@unisys.com> MIME-Version: 1.0 List-Id: Linux Driver Project Developer List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: driverdev-devel-bounces@linuxdriverproject.org To: gregkh@linuxfoundation.org Cc: driverdev-devel@linuxdriverproject.org, sparmaintainer@unisys.com, Benjamin Romer The CHANNEL_*_MISMATCH error message macros should not be inside of do blocks. Signed-off-by: Benjamin Romer --- .../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 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel