[PATCH 24/44] staging: unisys: visorbus: get rid of shouting SPAR_VBUS_CHANNEL_CLIENT_OK macro

[David Kershner]

The macro SPAR_VBUS_CHANNEL_CLIENT_OK was noisy and only used in one place
so get rid of it.

Signed-off-by: David Kershner <david.kershner at unisys.com>
Reviewed-by: Reviewed-by: Tim Sell <timothy.sell at unisys.com>
---
 drivers/staging/unisys/visorbus/vbuschannel.h   | 8 --------
 drivers/staging/unisys/visorbus/visorbus_main.c | 8 +++++++-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/unisys/visorbus/vbuschannel.h b/drivers/staging/unisys/visorbus/vbuschannel.h
index 4ef70fd..f0ef5ec 100644
--- a/drivers/staging/unisys/visorbus/vbuschannel.h
+++ b/drivers/staging/unisys/visorbus/vbuschannel.h
@@ -43,14 +43,6 @@ static const uuid_le spar_vbus_channel_protocol_uuid =
  */
 #define SPAR_VBUS_CHANNEL_PROTOCOL_VERSIONID 1
 
-#define SPAR_VBUS_CHANNEL_OK_CLIENT(ch) \
-	spar_check_channel_client(ch, \
-				  spar_vbus_channel_protocol_uuid, \
-				  "vbus", \
-				  sizeof(struct spar_vbus_channel_protocol), \
-				  SPAR_VBUS_CHANNEL_PROTOCOL_VERSIONID, \
-				  SPAR_VBUS_CHANNEL_PROTOCOL_SIGNATURE)
-
 /*
  * An array of this struct is present in the channel area for each vbus.
  * (See vbuschannel.h.)
diff --git a/drivers/staging/unisys/visorbus/visorbus_main.c b/drivers/staging/unisys/visorbus/visorbus_main.c
index 094a60e..8b434b0 100644
--- a/drivers/staging/unisys/visorbus/visorbus_main.c
+++ b/drivers/staging/unisys/visorbus/visorbus_main.c
@@ -699,7 +699,13 @@ static int
 get_vbus_header_info(struct visorchannel *chan,
 		     struct spar_vbus_headerinfo *hdr_info)
 {
-	if (!SPAR_VBUS_CHANNEL_OK_CLIENT(visorchannel_get_header(chan)))
+	if (!spar_check_channel_client(visorchannel_get_header(chan),
+				       spar_vbus_channel_protocol_uuid,
+				       "vbus",
+				       sizeof
+					    (struct spar_vbus_channel_protocol),
+				       SPAR_VBUS_CHANNEL_PROTOCOL_VERSIONID,
+				       SPAR_VBUS_CHANNEL_PROTOCOL_SIGNATURE))
 		return -EINVAL;
 
 	if (visorchannel_read(chan, sizeof(struct channel_header), hdr_info,
-- 
git-series 0.9.1