From: David Kershner Date: Tue, 28 Mar 2017 13:34:41 +0000 (-0400) Subject: staging: unisys: visorbus: get rid of shouting SPAR_VBUS_CHANNEL_CLIENT_OK macro X-Git-Tag: Ubuntu-5.2.0-15.16~6936^2~315 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=3a6b850670dca3259b3c7cd3060b63bb382014cf;p=mirror_ubuntu-eoan-kernel.git staging: unisys: visorbus: get rid of shouting SPAR_VBUS_CHANNEL_CLIENT_OK macro 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 Reviewed-by: Reviewed-by: Tim Sell Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/unisys/visorbus/vbuschannel.h b/drivers/staging/unisys/visorbus/vbuschannel.h index 4ef70fd90a2d..f0ef5ecf3d7d 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 094a60e53984..8b434b0d73b8 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,