leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: unisys: remove client from spar_check_channel

Browse Source 
We only have one version of spar_check_channel, get rid of the client
at the end and help save space.

Signed-off-by: David Kershner <david.kershner@unisys.com>
Reviewed-by: Reviewed-by: Tim Sell <timothy.sell@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
David Kershner 2017-03-28 09:34:42 -04:00 committed by Greg Kroah-Hartman
parent 3a6b850670
commit 3659955a64
4 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/unisys/include/channel.h
View File

@ -204,12 +204,12 @@ 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,
u32 expected_version, u32 expected_version,
u64 expected_signature) u64 expected_signature)
{ {
if (uuid_le_cmp(expected_uuid, NULL_UUID_LE) != 0) { if (uuid_le_cmp(expected_uuid, NULL_UUID_LE) != 0) {
/* caller wants us to verify type GUID */ /* caller wants us to verify type GUID */

16
drivers/staging/unisys/include/iochannel.h
View File

@ -51,16 +51,16 @@
#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))
/* /*
* Everything necessary to handle SCSI & NIC traffic between Guest Partition and * Everything necessary to handle SCSI & NIC traffic between Guest Partition and

12
drivers/staging/unisys/visorbus/controlvmchannel.h
View File

@ -36,12 +36,12 @@
#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), \
ULTRA_CONTROLVM_CHANNEL_PROTOCOL_VERSIONID, \ ULTRA_CONTROLVM_CHANNEL_PROTOCOL_VERSIONID, \
ULTRA_CONTROLVM_CHANNEL_PROTOCOL_SIGNATURE)) ULTRA_CONTROLVM_CHANNEL_PROTOCOL_SIGNATURE))
/* Defines for various channel queues */ /* Defines for various channel queues */
#define CONTROLVM_QUEUE_REQUEST 0 #define CONTROLVM_QUEUE_REQUEST 0

13
drivers/staging/unisys/visorbus/visorbus_main.c
View File

@ -699,13 +699,12 @@ 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;
if (visorchannel_read(chan, sizeof(struct channel_header), hdr_info, if (visorchannel_read(chan, sizeof(struct channel_header), hdr_info,