From: Benjamin Romer Date: Thu, 23 Oct 2014 18:29:57 +0000 (-0400) Subject: staging: unisys: clean up ULTRA_CHANNEL_SERVER_READY macro X-Git-Tag: v3.19-rc1~66^2~999 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=10b133c7628a83b058458c667934d35a12b3dc4f;p=karo-tx-linux.git 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/unisys/common-spar/include/channels/channel.h b/drivers/staging/unisys/common-spar/include/channels/channel.h index dafb14d50c9f..c6d04af589a7 100644 --- a/drivers/staging/unisys/common-spar/include/channels/channel.h +++ b/drivers/staging/unisys/common-spar/include/channels/channel.h @@ -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)) || \ diff --git a/drivers/staging/unisys/virtpci/virtpci.c b/drivers/staging/unisys/virtpci/virtpci.c index 2be0447c612e..160ed8284e88 100644 --- a/drivers/staging/unisys/virtpci/virtpci.c +++ b/drivers/staging/unisys/virtpci/virtpci.c @@ -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--;