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

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>

diff --git a/drivers/staging/unisys/include/channel.h b/drivers/staging/unisys/include/channel.h
index 057421eeb1ae5ad230409f660d96df5608f96ca8..e22a1519a8c34f189584f54401899a08aa2ba39b 100644 (file)
--- a/drivers/staging/unisys/include/channel.h
+++ b/drivers/staging/unisys/include/channel.h
@@ -204,12 +204,12 @@ struct signal_queue_header {
  * is used to pass the EFI_DIAG_CAPTURE_PROTOCOL needed to log messages.
  */
 static inline int
-spar_check_channel(struct channel_header *ch,
-                  uuid_le expected_uuid,
-                  char *chname,
-                  u64 expected_min_bytes,
-                  u32 expected_version,
-                  u64 expected_signature)
+visor_check_channel(struct channel_header *ch,
+                   uuid_le expected_uuid,
+                   char *chname,
+                   u64 expected_min_bytes,
+                   u32 expected_version,
+                   u64 expected_signature)
 {
        if (uuid_le_cmp(expected_uuid, NULL_UUID_LE) != 0) {
                /* caller wants us to verify type GUID */

diff --git a/drivers/staging/unisys/include/iochannel.h b/drivers/staging/unisys/include/iochannel.h
index 9bde848a321cd7121bec54c099a896e943d918ee..ce0e2e2008cfd230853b5b7e2b7b29551374414d 100644 (file)
--- a/drivers/staging/unisys/include/iochannel.h
+++ b/drivers/staging/unisys/include/iochannel.h
@@ -51,13 +51,13 @@
 #define ULTRA_VSWITCH_CHANNEL_PROTOCOL_VERSIONID 1
 
 #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,        \
                            ULTRA_VHBA_CHANNEL_PROTOCOL_VERSIONID, \
                            ULTRA_VHBA_CHANNEL_PROTOCOL_SIGNATURE))
 
 #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,        \
                            ULTRA_VNIC_CHANNEL_PROTOCOL_VERSIONID, \
                            ULTRA_VNIC_CHANNEL_PROTOCOL_SIGNATURE))

diff --git a/drivers/staging/unisys/visorbus/controlvmchannel.h b/drivers/staging/unisys/visorbus/controlvmchannel.h
index e8716ca86d2daec34a5017ef4d479c8c36e4783d..506ed0d70d32710da8a3b6a952378eee01eaace8 100644 (file)
--- a/drivers/staging/unisys/visorbus/controlvmchannel.h
+++ b/drivers/staging/unisys/visorbus/controlvmchannel.h
@@ -35,12 +35,12 @@
 #define VISOR_CONTROLVM_CHANNEL_VERSIONID 1
 
 #define VISOR_CONTROLVM_CHANNEL_OK_CLIENT(ch) \
-       (spar_check_channel(ch, \
-                           VISOR_CONTROLVM_CHANNEL_UUID, \
-                           "controlvm", \
-                           sizeof(struct visor_controlvm_channel), \
-                           VISOR_CONTROLVM_CHANNEL_VERSIONID, \
-                           VISOR_CONTROLVM_CHANNEL_SIGNATURE))
+       (visor_check_channel(ch, \
+                            VISOR_CONTROLVM_CHANNEL_UUID, \
+                            "controlvm", \
+                            sizeof(struct visor_controlvm_channel), \
+                            VISOR_CONTROLVM_CHANNEL_VERSIONID, \
+                            VISOR_CONTROLVM_CHANNEL_SIGNATURE))
 
 /* Defines for various channel queues */
 #define CONTROLVM_QUEUE_REQUEST         0

diff --git a/drivers/staging/unisys/visorbus/visorbus_main.c b/drivers/staging/unisys/visorbus/visorbus_main.c
index e2631f553131e8f312def74beb9a9dac40ed16ba..1c785dd19ddd89bf894287303e0e763d3e13b292 100644 (file)
--- a/drivers/staging/unisys/visorbus/visorbus_main.c
+++ b/drivers/staging/unisys/visorbus/visorbus_main.c
@@ -686,12 +686,12 @@ get_vbus_header_info(struct visorchannel *chan,
 {
        int err;
 
-       if (!spar_check_channel(visorchannel_get_header(chan),
-                               visor_vbus_channel_uuid,
-                               "vbus",
-                               sizeof(struct visor_vbus_channel),
-                               VISOR_VBUS_CHANNEL_VERSIONID,
-                               VISOR_VBUS_CHANNEL_SIGNATURE))
+       if (!visor_check_channel(visorchannel_get_header(chan),
+                                visor_vbus_channel_uuid,
+                                "vbus",
+                                sizeof(struct visor_vbus_channel),
+                                VISOR_VBUS_CHANNEL_VERSIONID,
+                                VISOR_VBUS_CHANNEL_SIGNATURE))
                return -EINVAL;
 
        err = visorchannel_read(chan, sizeof(struct channel_header), hdr_info,