UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: unisys: include: renamed function spar_check_channel in channel.h to match driver namespace 

Renamed function spar_check_channel() to visor_check_channel().

Signed-off-by: Sameer Wadgaonkar <sameer.wadgaonkar@unisys.com>
Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sameer Wadgaonkar 2017-05-19 16:17:54 -04:00 committed by Greg Kroah-Hartman
parent bac41a2f68
commit 315dfc84d1
4 changed files with 20 additions and 20 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(struct channel_header *ch, visor_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 */

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

@ -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(ch, spar_vhba_channel_protocol_uuid, \ (visor_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(ch, spar_vnic_channel_protocol_uuid, \ (visor_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))

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

@ -35,12 +35,12 @@
#define VISOR_CONTROLVM_CHANNEL_VERSIONID 1 #define VISOR_CONTROLVM_CHANNEL_VERSIONID 1
#define VISOR_CONTROLVM_CHANNEL_OK_CLIENT(ch) \ #define VISOR_CONTROLVM_CHANNEL_OK_CLIENT(ch) \
(spar_check_channel(ch, \ (visor_check_channel(ch, \
VISOR_CONTROLVM_CHANNEL_UUID, \ VISOR_CONTROLVM_CHANNEL_UUID, \
"controlvm", \ "controlvm", \
sizeof(struct visor_controlvm_channel), \ sizeof(struct visor_controlvm_channel), \
VISOR_CONTROLVM_CHANNEL_VERSIONID, \ VISOR_CONTROLVM_CHANNEL_VERSIONID, \
VISOR_CONTROLVM_CHANNEL_SIGNATURE)) VISOR_CONTROLVM_CHANNEL_SIGNATURE))
/* Defines for various channel queues */ /* Defines for various channel queues */
#define CONTROLVM_QUEUE_REQUEST 0 #define CONTROLVM_QUEUE_REQUEST 0

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

@ -686,12 +686,12 @@ get_vbus_header_info(struct visorchannel *chan,
{ {
int err; int err;
if (!spar_check_channel(visorchannel_get_header(chan), if (!visor_check_channel(visorchannel_get_header(chan),
visor_vbus_channel_uuid, visor_vbus_channel_uuid,
"vbus", "vbus",
sizeof(struct visor_vbus_channel), sizeof(struct visor_vbus_channel),
VISOR_VBUS_CHANNEL_VERSIONID, VISOR_VBUS_CHANNEL_VERSIONID,
VISOR_VBUS_CHANNEL_SIGNATURE)) VISOR_VBUS_CHANNEL_SIGNATURE))
return -EINVAL; return -EINVAL;
err = visorchannel_read(chan, sizeof(struct channel_header), hdr_info, err = visorchannel_read(chan, sizeof(struct channel_header), hdr_info,