From 13d58a982df0227c9b57638e2f0553cba34cf576 Mon Sep 17 00:00:00 2001 From: Benjamin Romer Date: Thu, 23 Oct 2014 14:29:58 -0400 Subject: [PATCH] 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 Signed-off-by: Greg Kroah-Hartman --- .../staging/unisys/common-spar/include/channels/channel.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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", \ + id, "CliState", \ 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, \ -- 2.30.2