UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Benjamin Romer 2014-10-23 14:29:58 -04:00 committed by Greg Kroah-Hartman
parent 10b133c762
commit 13d58a982d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/unisys/common-spar/include/channels/channel.h
View File

@ -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, \