staging: unisys: clean up ULTRA_CHANNEL_SERVER_READY macro

Simplify this macro so it is only one macro, rename it to
SPAR_CHANNEL_SERVER_READY, and get rid of the CamelCase parameter name.

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:57 -04:00 committed by Greg Kroah-Hartman
parent a8a31f6177
commit 10b133c762
2 changed files with 3 additions and 4 deletions

View File

@ -93,9 +93,8 @@ ULTRA_CHANNELCLI_STRING(u32 v)
return (const u8 *)("?");
}
#define ULTRA_CHANNELSRV_IS_READY(x) ((x) == CHANNELSRV_READY)
#define ULTRA_CHANNEL_SERVER_READY(pChannel) \
(ULTRA_CHANNELSRV_IS_READY(readl(&(pChannel)->srv_state)))
#define SPAR_CHANNEL_SERVER_READY(ch) \
(readl(&(ch)->srv_state) == CHANNELSRV_READY)
#define ULTRA_VALID_CHANNELCLI_TRANSITION(o, n) \
(((((o) == CHANNELCLI_DETACHED) && ((n) == CHANNELCLI_DISABLED)) || \

View File

@ -177,7 +177,7 @@ int WAIT_FOR_IO_CHANNEL(ULTRA_IO_CHANNEL_PROTOCOL __iomem *chanptr)
while (count > 0) {
if (ULTRA_CHANNEL_SERVER_READY(&chanptr->ChannelHeader))
if (SPAR_CHANNEL_SERVER_READY(&chanptr->ChannelHeader))
return 1;
UIS_THREAD_WAIT_SEC(1);
count--;