staging: unisys: fix CamelCase channel constants

The channel definitions in channel_guid.h contain several CamelCase
constants. Fix these so they are no longer incorrectly cased, and use
the name spar instead of the old "ultra" reference. Also, rename the
corresponding UUID macros to match. Update all references to constants
or UUID macros that were changed.

Fix CamelCase names:
UltraVhbaChannelProtocolGuid => spar_vhba_channel_protocol_uuid
UltraVnicChannelProtocolGuid => spar_vnic_channel_protocol_uuid
UltraSIOVMGuid => spar_siovm_uuid
UltraControlDirectorChannelProtocolGuid =>
		spar_controldirector_channel_protocol_uuid

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/unisys/common-spar/include/channels/channel_guid.h b/drivers/staging/unisys/common-spar/include/channels/channel_guid.h
index 63c67ca4c9ec523a8e76ce144e74cbe562a23695..16df33a751a67407b6858ff88611a2efa4d543c0 100644 (file)
--- a/drivers/staging/unisys/common-spar/include/channels/channel_guid.h
+++ b/drivers/staging/unisys/common-spar/include/channels/channel_guid.h
@@ -20,44 +20,44 @@
 /* Used in IOChannel
  * {414815ed-c58c-11da-95a9-00e08161165f}
  */
-#define ULTRA_VHBA_CHANNEL_PROTOCOL_GUID \
+#define SPAR_VHBA_CHANNEL_PROTOCOL_UUID \
                UUID_LE(0x414815ed, 0xc58c, 0x11da, \
                                0x95, 0xa9, 0x0, 0xe0, 0x81, 0x61, 0x16, 0x5f)
-static const uuid_le UltraVhbaChannelProtocolGuid =
-       ULTRA_VHBA_CHANNEL_PROTOCOL_GUID;
+static const uuid_le spar_vhba_channel_protocol_uuid =
+       SPAR_VHBA_CHANNEL_PROTOCOL_UUID;
 
 /* Used in IOChannel
  * {8cd5994d-c58e-11da-95a9-00e08161165f}
  */
-#define ULTRA_VNIC_CHANNEL_PROTOCOL_GUID \
+#define SPAR_VNIC_CHANNEL_PROTOCOL_UUID \
                UUID_LE(0x8cd5994d, 0xc58e, 0x11da, \
                                0x95, 0xa9, 0x0, 0xe0, 0x81, 0x61, 0x16, 0x5f)
-static const uuid_le UltraVnicChannelProtocolGuid =
-       ULTRA_VNIC_CHANNEL_PROTOCOL_GUID;
+static const uuid_le spar_vnic_channel_protocol_uuid =
+       SPAR_VNIC_CHANNEL_PROTOCOL_UUID;
 
 /* Used in IOChannel
  * {72120008-4AAB-11DC-8530-444553544200}
  */
-#define ULTRA_SIOVM_GUID \
+#define SPAR_SIOVM_UUID \
                UUID_LE(0x72120008, 0x4AAB, 0x11DC, \
                                0x85, 0x30, 0x44, 0x45, 0x53, 0x54, 0x42, 0x00)
-static const uuid_le UltraSIOVMGuid = ULTRA_SIOVM_GUID;
+static const uuid_le spar_siovm_uuid = SPAR_SIOVM_UUID;
 
 
 /* Used in visornoop/visornoop_main.c
  * {5b52c5ac-e5f5-4d42-8dff-429eaecd221f}
  */
-#define ULTRA_CONTROLDIRECTOR_CHANNEL_PROTOCOL_GUID  \
+#define SPAR_CONTROLDIRECTOR_CHANNEL_PROTOCOL_UUID  \
                UUID_LE(0x5b52c5ac, 0xe5f5, 0x4d42, \
                                0x8d, 0xff, 0x42, 0x9e, 0xae, 0xcd, 0x22, 0x1f)
 
-static const uuid_le UltraControlDirectorChannelProtocolGuid =
-       ULTRA_CONTROLDIRECTOR_CHANNEL_PROTOCOL_GUID;
+static const uuid_le spar_controldirector_channel_protocol_uuid =
+       SPAR_CONTROLDIRECTOR_CHANNEL_PROTOCOL_UUID;
 
 /* Used in visorchipset/visorchipset_main.c
  * {B4E79625-AEDE-4EAA-9E11-D3EDDCD4504C}
  */
-#define ULTRA_DIAG_POOL_CHANNEL_PROTOCOL_GUID                          \
+#define SPAR_DIAG_POOL_CHANNEL_PROTOCOL_UUID                           \
                UUID_LE(0xb4e79625, 0xaede, 0x4eaa, \
                                0x9e, 0x11, 0xd3, 0xed, 0xdc, 0xd4, 0x50, 0x4c)
 

diff --git a/drivers/staging/unisys/common-spar/include/channels/iochannel.h b/drivers/staging/unisys/common-spar/include/channels/iochannel.h
index 806d5b3bca481c8b219b127d2a78beed7cb9847c..7de87a481a8cf97677fd7b41efc2883665f8f551 100644 (file)
--- a/drivers/staging/unisys/common-spar/include/channels/iochannel.h
+++ b/drivers/staging/unisys/common-spar/include/channels/iochannel.h
@@ -61,23 +61,23 @@
 #define ULTRA_VSWITCH_CHANNEL_PROTOCOL_VERSIONID 1
 
 #define ULTRA_VHBA_CHANNEL_OK_CLIENT(pChannel, logCtx)                 \
-       (ULTRA_check_channel_client(pChannel, UltraVhbaChannelProtocolGuid, \
+       (ULTRA_check_channel_client(pChannel, spar_vhba_channel_protocol_uuid, \
                                    "vhba", MIN_IO_CHANNEL_SIZE,        \
                                    ULTRA_VHBA_CHANNEL_PROTOCOL_VERSIONID, \
                                    ULTRA_VHBA_CHANNEL_PROTOCOL_SIGNATURE, \
                                    __FILE__, __LINE__, logCtx))
 #define ULTRA_VHBA_CHANNEL_OK_SERVER(actualBytes, logCtx)              \
-       (ULTRA_check_channel_server(UltraVhbaChannelProtocolGuid,       \
+       (ULTRA_check_channel_server(spar_vhba_channel_protocol_uuid,    \
                                    "vhba", MIN_IO_CHANNEL_SIZE, actualBytes, \
                                    __FILE__, __LINE__, logCtx))
 #define ULTRA_VNIC_CHANNEL_OK_CLIENT(pChannel, logCtx)                 \
-       (ULTRA_check_channel_client(pChannel, UltraVnicChannelProtocolGuid, \
+       (ULTRA_check_channel_client(pChannel, spar_vnic_channel_protocol_uuid, \
                                    "vnic", MIN_IO_CHANNEL_SIZE,        \
                                    ULTRA_VNIC_CHANNEL_PROTOCOL_VERSIONID, \
                                    ULTRA_VNIC_CHANNEL_PROTOCOL_SIGNATURE, \
                                    __FILE__, __LINE__, logCtx))
 #define ULTRA_VNIC_CHANNEL_OK_SERVER(actualBytes, logCtx)              \
-       (ULTRA_check_channel_server(UltraVnicChannelProtocolGuid,       \
+       (ULTRA_check_channel_server(spar_vnic_channel_protocol_uuid,    \
                                    "vnic", MIN_IO_CHANNEL_SIZE, actualBytes, \
                                    __FILE__, __LINE__, logCtx))
 #define ULTRA_VSWITCH_CHANNEL_OK_CLIENT(pChannel, logCtx)              \
@@ -807,7 +807,7 @@ static inline int ULTRA_VHBA_init_channel(ULTRA_IO_CHANNEL_PROTOCOL *x,
        x->ChannelHeader.SrvState = CHANNELSRV_UNINITIALIZED;
        x->ChannelHeader.HeaderSize = sizeof(x->ChannelHeader);
        x->ChannelHeader.Size = COVER(bytes, 4096);
-       x->ChannelHeader.Type = UltraVhbaChannelProtocolGuid;
+       x->ChannelHeader.Type = spar_vhba_channel_protocol_uuid;
        x->ChannelHeader.ZoneGuid = NULL_UUID_LE;
        x->vhba.wwnn = *wwnn;
        x->vhba.max = *max;
@@ -843,7 +843,7 @@ static inline int ULTRA_VNIC_init_channel(ULTRA_IO_CHANNEL_PROTOCOL *x,
        x->ChannelHeader.SrvState = CHANNELSRV_UNINITIALIZED;
        x->ChannelHeader.HeaderSize = sizeof(x->ChannelHeader);
        x->ChannelHeader.Size = COVER(bytes, 4096);
-       x->ChannelHeader.Type = UltraVnicChannelProtocolGuid;
+       x->ChannelHeader.Type = spar_vnic_channel_protocol_uuid;
        x->ChannelHeader.ZoneGuid = NULL_UUID_LE;
        memcpy(x->vnic.macaddr, macaddr, MAX_MACADDR_LEN);
        x->vnic.num_rcv_bufs = num_rcv_bufs;

diff --git a/drivers/staging/unisys/uislib/uislib.c b/drivers/staging/unisys/uislib/uislib.c
index b1f6c6ef801b3fec9472b44ffcba8e477e2fb730..35e8a61c72023dfd797652a0faca844daba3ead5 100644 (file)
--- a/drivers/staging/unisys/uislib/uislib.c
+++ b/drivers/staging/unisys/uislib/uislib.c
@@ -443,7 +443,7 @@ create_device(CONTROLVM_MESSAGE *msg, char *buf)
                                struct guest_msgs cmd;
 
                                if (!uuid_le_cmp(dev->channel_uuid,
-                                    UltraVhbaChannelProtocolGuid)) {
+                                    spar_vhba_channel_protocol_uuid)) {
                                        wait_for_valid_guid(&((CHANNEL_HEADER
                                                              __iomem *) (dev->
                                                                  chanptr))->
@@ -468,7 +468,7 @@ create_device(CONTROLVM_MESSAGE *msg, char *buf)
                                        cmd.add_vhba.intr = dev->intr;
                                } else
                                    if (!uuid_le_cmp(dev->channel_uuid,
-                                        UltraVnicChannelProtocolGuid)) {
+                                        spar_vnic_channel_protocol_uuid)) {
                                        wait_for_valid_guid(&((CHANNEL_HEADER
                                                              __iomem *) (dev->
                                                                  chanptr))->
@@ -585,11 +585,11 @@ pause_device(CONTROLVM_MESSAGE *msg)
                 * guest_msgs struct to callback
                 */
                if (!uuid_le_cmp(dev->channel_uuid,
-                               UltraVhbaChannelProtocolGuid)) {
+                               spar_vhba_channel_protocol_uuid)) {
                        cmd.msgtype = GUEST_PAUSE_VHBA;
                        cmd.pause_vhba.chanptr = dev->chanptr;
                } else if (!uuid_le_cmp(dev->channel_uuid,
-                                       UltraVnicChannelProtocolGuid)) {
+                                       spar_vnic_channel_protocol_uuid)) {
                        cmd.msgtype = GUEST_PAUSE_VNIC;
                        cmd.pause_vnic.chanptr = dev->chanptr;
                } else {
@@ -654,11 +654,11 @@ resume_device(CONTROLVM_MESSAGE *msg)
         */
        if (retval == CONTROLVM_RESP_SUCCESS) {
                if (!uuid_le_cmp(dev->channel_uuid,
-                                UltraVhbaChannelProtocolGuid)) {
+                                spar_vhba_channel_protocol_uuid)) {
                        cmd.msgtype = GUEST_RESUME_VHBA;
                        cmd.resume_vhba.chanptr = dev->chanptr;
                } else if (!uuid_le_cmp(dev->channel_uuid,
-                                       UltraVnicChannelProtocolGuid)) {
+                                       spar_vnic_channel_protocol_uuid)) {
                        cmd.msgtype = GUEST_RESUME_VNIC;
                        cmd.resume_vnic.chanptr = dev->chanptr;
                } else {
@@ -724,11 +724,11 @@ destroy_device(CONTROLVM_MESSAGE *msg, char *buf)
                 * guest_msgs struct to callback
                 */
                if (!uuid_le_cmp(dev->channel_uuid,
-                                UltraVhbaChannelProtocolGuid)) {
+                                spar_vhba_channel_protocol_uuid)) {
                        cmd.msgtype = GUEST_DEL_VHBA;
                        cmd.del_vhba.chanptr = dev->chanptr;
                } else if (!uuid_le_cmp(dev->channel_uuid,
-                                       UltraVnicChannelProtocolGuid)) {
+                                       spar_vnic_channel_protocol_uuid)) {
                        cmd.msgtype = GUEST_DEL_VNIC;
                        cmd.del_vnic.chanptr = dev->chanptr;
                } else {
@@ -960,7 +960,7 @@ uislib_client_inject_add_vhba(u32 bus_no, u32 dev_no,
                return 0;
        }
        msg.cmd.createDevice.channelBytes = chan_bytes;
-       msg.cmd.createDevice.dataTypeGuid = UltraVhbaChannelProtocolGuid;
+       msg.cmd.createDevice.dataTypeGuid = spar_vhba_channel_protocol_uuid;
        if (create_device(&msg, NULL) != CONTROLVM_RESP_SUCCESS) {
                LOGERR("VHBA create_device failed.\n");
                POSTCODE_LINUX_4(VHBA_CREATE_FAILURE_PC, dev_no, bus_no,
@@ -1019,7 +1019,7 @@ uislib_client_inject_add_vnic(u32 bus_no, u32 dev_no,
                return 0;
        }
        msg.cmd.createDevice.channelBytes = chan_bytes;
-       msg.cmd.createDevice.dataTypeGuid = UltraVnicChannelProtocolGuid;
+       msg.cmd.createDevice.dataTypeGuid = spar_vnic_channel_protocol_uuid;
        if (create_device(&msg, NULL) != CONTROLVM_RESP_SUCCESS) {
                LOGERR("VNIC create_device failed.\n");
                POSTCODE_LINUX_4(VNIC_CREATE_FAILURE_PC, dev_no, bus_no,
@@ -1109,7 +1109,7 @@ uislib_client_add_vnic(u32 busNo)
        memset(&msg.cmd.createDevice.intr, 0, sizeof(struct irq_info));
        msg.cmd.createDevice.channelAddr = PhysicalDataChan;
        msg.cmd.createDevice.channelBytes = MIN_IO_CHANNEL_SIZE;
-       msg.cmd.createDevice.dataTypeGuid = UltraVnicChannelProtocolGuid;
+       msg.cmd.createDevice.dataTypeGuid = spar_vnic_channel_protocol_uuid;
        if (create_device(&msg, NULL) != CONTROLVM_RESP_SUCCESS) {
                LOGERR("client create_device failed");
                goto AwayCleanup;

diff --git a/drivers/staging/unisys/visorchipset/visorchipset_main.c b/drivers/staging/unisys/visorchipset/visorchipset_main.c
index ee03c59dc8899b89cce6648e1779590292dc343b..cfacf17ad26a05163529ad4b96b928a25b6d19ee 100644 (file)
--- a/drivers/staging/unisys/visorchipset/visorchipset_main.c
+++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c
@@ -80,7 +80,7 @@ static CONTROLVM_MESSAGE_HEADER g_DiagMsgHdr;
 static CONTROLVM_MESSAGE_HEADER g_ChipSetMsgHdr;
 static CONTROLVM_MESSAGE_HEADER g_DelDumpMsgHdr;
 static const uuid_le UltraDiagPoolChannelProtocolGuid =
-       ULTRA_DIAG_POOL_CHANNEL_PROTOCOL_GUID;
+       SPAR_DIAG_POOL_CHANNEL_PROTOCOL_UUID;
 /* 0xffffff is an invalid Bus/Device number */
 static ulong g_diagpoolBusNo = 0xffffff;
 static ulong g_diagpoolDevNo = 0xffffff;
@@ -90,8 +90,10 @@ static CONTROLVM_MESSAGE_PACKET g_DeviceChangeStatePacket;
  * "visorhackbus")
  */
 #define FOR_VISORHACKBUS(channel_type_guid) \
-       (((uuid_le_cmp(channel_type_guid, UltraVnicChannelProtocolGuid) == 0)\
-       || (uuid_le_cmp(channel_type_guid, UltraVhbaChannelProtocolGuid) == 0)))
+       (((uuid_le_cmp(channel_type_guid,\
+                      spar_vnic_channel_protocol_uuid) == 0)\
+       || (uuid_le_cmp(channel_type_guid,\
+                       spar_vhba_channel_protocol_uuid) == 0)))
 #define FOR_VISORBUS(channel_type_guid) (!(FOR_VISORHACKBUS(channel_type_guid)))
 
 #define is_diagpool_channel(channel_type_guid) \