From: Benjamin Romer <benjamin.romer@unisys.com>
Date: Thu, 23 Oct 2014 18:29:58 +0000 (-0400)
Subject: staging: unisys: fix ULTRA_SPAR_CHANNEL_CLIENT_CHK_TRANSITION macro
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=13d58a982df0227c9b57638e2f0553cba34cf576;p=linux-beck.git

staging: unisys: fix ULTRA_SPAR_CHANNEL_CLIENT_CHK_TRANSITION macro

Rename the macro to SPAR_CHANNEL_CLIENT_CHK_TRANSITION, and rename
CamelCase parameters to:

chanId => id
logCtx => log

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/unisys/common-spar/include/channels/channel.h b/drivers/staging/unisys/common-spar/include/channels/channel.h
index c6d04af589a7..2ce687e2cd31 100644
--- a/drivers/staging/unisys/common-spar/include/channels/channel.h
+++ b/drivers/staging/unisys/common-spar/include/channels/channel.h
@@ -114,12 +114,12 @@ ULTRA_CHANNELCLI_STRING(u32 v)
 	  (((o) == CHANNELCLI_BUSY) && ((n) == CHANNELCLI_OWNED)) || (0)) \
 	 ? (1) : (0))
 
-#define ULTRA_CHANNEL_CLIENT_CHK_TRANSITION(old, new, chanId, logCtx,	\
+#define SPAR_CHANNEL_CLIENT_CHK_TRANSITION(old, new, id, log,	\
 					    file, line)			\
 	do {								\
 		if (!ULTRA_VALID_CHANNELCLI_TRANSITION(old, new))	\
 			pr_info("%s Channel StateTransition INVALID! (%s) %s(%d)-->%s(%d) @%s:%d\n", \
-				chanId, "CliState<x>",		\
+				id, "CliState<x>",		\
 				ULTRA_CHANNELCLI_STRING(old),	\
 				old,				\
 				ULTRA_CHANNELCLI_STRING(new),	\
@@ -131,7 +131,7 @@ ULTRA_CHANNELCLI_STRING(u32 v)
 #define ULTRA_CHANNEL_CLIENT_TRANSITION(pChan, chanId,			\
 					newstate, logCtx)		\
 	do {								\
-		ULTRA_CHANNEL_CLIENT_CHK_TRANSITION(			\
+		SPAR_CHANNEL_CLIENT_CHK_TRANSITION(			\
 			readl(&(((struct channel_header __iomem *) \
 				 (pChan))->cli_state_os)),		\
 			newstate,					\