Commit 3659955a authored by David Kershner's avatar David Kershner Committed by Greg Kroah-Hartman

staging: unisys: remove client from spar_check_channel

We only have one version of spar_check_channel, get rid of the client
at the end and help save space.
Signed-off-by: default avatarDavid Kershner <david.kershner@unisys.com>
Reviewed-by: default avatarReviewed-by: Tim Sell <timothy.sell@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3a6b8506
...@@ -204,7 +204,7 @@ struct signal_queue_header { ...@@ -204,7 +204,7 @@ struct signal_queue_header {
* is used to pass the EFI_DIAG_CAPTURE_PROTOCOL needed to log messages. * is used to pass the EFI_DIAG_CAPTURE_PROTOCOL needed to log messages.
*/ */
static inline int static inline int
spar_check_channel_client(struct channel_header *ch, spar_check_channel(struct channel_header *ch,
uuid_le expected_uuid, uuid_le expected_uuid,
char *chname, char *chname,
u64 expected_min_bytes, u64 expected_min_bytes,
......
...@@ -51,13 +51,13 @@ ...@@ -51,13 +51,13 @@
#define ULTRA_VSWITCH_CHANNEL_PROTOCOL_VERSIONID 1 #define ULTRA_VSWITCH_CHANNEL_PROTOCOL_VERSIONID 1
#define SPAR_VHBA_CHANNEL_OK_CLIENT(ch) \ #define SPAR_VHBA_CHANNEL_OK_CLIENT(ch) \
(spar_check_channel_client(ch, spar_vhba_channel_protocol_uuid, \ (spar_check_channel(ch, spar_vhba_channel_protocol_uuid, \
"vhba", MIN_IO_CHANNEL_SIZE, \ "vhba", MIN_IO_CHANNEL_SIZE, \
ULTRA_VHBA_CHANNEL_PROTOCOL_VERSIONID, \ ULTRA_VHBA_CHANNEL_PROTOCOL_VERSIONID, \
ULTRA_VHBA_CHANNEL_PROTOCOL_SIGNATURE)) ULTRA_VHBA_CHANNEL_PROTOCOL_SIGNATURE))
#define SPAR_VNIC_CHANNEL_OK_CLIENT(ch) \ #define SPAR_VNIC_CHANNEL_OK_CLIENT(ch) \
(spar_check_channel_client(ch, spar_vnic_channel_protocol_uuid, \ (spar_check_channel(ch, spar_vnic_channel_protocol_uuid, \
"vnic", MIN_IO_CHANNEL_SIZE, \ "vnic", MIN_IO_CHANNEL_SIZE, \
ULTRA_VNIC_CHANNEL_PROTOCOL_VERSIONID, \ ULTRA_VNIC_CHANNEL_PROTOCOL_VERSIONID, \
ULTRA_VNIC_CHANNEL_PROTOCOL_SIGNATURE)) ULTRA_VNIC_CHANNEL_PROTOCOL_SIGNATURE))
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#define ULTRA_CONTROLVM_CHANNEL_PROTOCOL_VERSIONID 1 #define ULTRA_CONTROLVM_CHANNEL_PROTOCOL_VERSIONID 1
#define SPAR_CONTROLVM_CHANNEL_OK_CLIENT(ch) \ #define SPAR_CONTROLVM_CHANNEL_OK_CLIENT(ch) \
(spar_check_channel_client(ch, \ (spar_check_channel(ch, \
SPAR_CONTROLVM_CHANNEL_PROTOCOL_UUID, \ SPAR_CONTROLVM_CHANNEL_PROTOCOL_UUID, \
"controlvm", \ "controlvm", \
sizeof(struct spar_controlvm_channel_protocol), \ sizeof(struct spar_controlvm_channel_protocol), \
......
...@@ -699,11 +699,10 @@ static int ...@@ -699,11 +699,10 @@ static int
get_vbus_header_info(struct visorchannel *chan, get_vbus_header_info(struct visorchannel *chan,
struct spar_vbus_headerinfo *hdr_info) struct spar_vbus_headerinfo *hdr_info)
{ {
if (!spar_check_channel_client(visorchannel_get_header(chan), if (!spar_check_channel(visorchannel_get_header(chan),
spar_vbus_channel_protocol_uuid, spar_vbus_channel_protocol_uuid,
"vbus", "vbus",
sizeof sizeof(struct spar_vbus_channel_protocol),
(struct spar_vbus_channel_protocol),
SPAR_VBUS_CHANNEL_PROTOCOL_VERSIONID, SPAR_VBUS_CHANNEL_PROTOCOL_VERSIONID,
SPAR_VBUS_CHANNEL_PROTOCOL_SIGNATURE)) SPAR_VBUS_CHANNEL_PROTOCOL_SIGNATURE))
return -EINVAL; return -EINVAL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment