staging: unisys: fix CamelCase in struct device_info

Clean up CamelCase names:
channelAddr => channel_addr
channelBytes => channel_bytes
channelTypeGuid => channel_uuid
devInstGuid => instance_uuid
busNo => bus_no
devNo => dev_no

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

diff --git a/drivers/staging/unisys/include/uisqueue.h b/drivers/staging/unisys/include/uisqueue.h
index 95695d89aec7cb00b661f429c6c54047da212b44..5190eddf5f7f34d7499aa4865ac43bb81e63fab1 100644 (file)
--- a/drivers/staging/unisys/include/uisqueue.h
+++ b/drivers/staging/unisys/include/uisqueue.h
@@ -129,17 +129,17 @@ struct extport_info {
 
 struct device_info {
        void __iomem *chanptr;
-       u64 channelAddr;
-       u64 channelBytes;
-       uuid_le channelTypeGuid;
-       uuid_le devInstGuid;
+       u64 channel_addr;
+       u64 channel_bytes;
+       uuid_le channel_uuid;
+       uuid_le instance_uuid;
        struct InterruptInfo intr;
        struct switch_info *swtch;
        char devid[30];         /* "vbus<busno>:dev<devno>" */
        u16 polling;
        struct semaphore interrupt_callback_lock;
-       u32 busNo;
-       u32 devNo;
+       u32 bus_no;
+       u32 dev_no;
        int (*interrupt)(void *);
        void *interrupt_context;
        void *private_data;

diff --git a/drivers/staging/unisys/uislib/uislib.c b/drivers/staging/unisys/uislib/uislib.c
index 1823f6f14abe09f505c09f44e8dd7391ff1af8db..99b576d0f4ab8b8ff0a6bd86b7694c79113162bc 100644 (file)
--- a/drivers/staging/unisys/uislib/uislib.c
+++ b/drivers/staging/unisys/uislib/uislib.c
@@ -368,18 +368,18 @@ create_device(CONTROLVM_MESSAGE *msg, char *buf)
                return CONTROLVM_RESP_ERROR_KMALLOC_FAILED;
        }
 
-       dev->channelTypeGuid = msg->cmd.createDevice.dataTypeGuid;
+       dev->channel_uuid = msg->cmd.createDevice.dataTypeGuid;
        dev->intr = msg->cmd.createDevice.intr;
-       dev->channelAddr = msg->cmd.createDevice.channelAddr;
-       dev->busNo = busNo;
-       dev->devNo = devNo;
+       dev->channel_addr = msg->cmd.createDevice.channelAddr;
+       dev->bus_no = busNo;
+       dev->dev_no = devNo;
        sema_init(&dev->interrupt_callback_lock, 1);    /* unlocked */
        sprintf(dev->devid, "vbus%u:dev%u", (unsigned) busNo, (unsigned) devNo);
        /* map the channel memory for the device. */
        if (msg->hdr.Flags.testMessage)
-               dev->chanptr = (void __iomem *)__va(dev->channelAddr);
+               dev->chanptr = (void __iomem *)__va(dev->channel_addr);
        else {
-               pReqHandler = ReqHandlerFind(dev->channelTypeGuid);
+               pReqHandler = ReqHandlerFind(dev->channel_uuid);
                if (pReqHandler)
                        /* generic service handler registered for this
                         * channel
@@ -395,11 +395,11 @@ create_device(CONTROLVM_MESSAGE *msg, char *buf)
                        goto Away;
                }
                dev->chanptr =
-                   uislib_ioremap_cache(dev->channelAddr,
+                   uislib_ioremap_cache(dev->channel_addr,
                                         msg->cmd.createDevice.channelBytes);
                if (!dev->chanptr) {
                        LOGERR("CONTROLVM_DEVICE_CREATE Failed: ioremap_cache of channelAddr:%Lx for channelBytes:%llu failed",
-                            dev->channelAddr,
+                            dev->channel_addr,
                             msg->cmd.createDevice.channelBytes);
                        result = CONTROLVM_RESP_ERROR_IOREMAP_FAILED;
                        POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, devNo, busNo,
@@ -407,8 +407,8 @@ create_device(CONTROLVM_MESSAGE *msg, char *buf)
                        goto Away;
                }
        }
-       dev->devInstGuid = msg->cmd.createDevice.devInstGuid;
-       dev->channelBytes = msg->cmd.createDevice.channelBytes;
+       dev->instance_uuid = msg->cmd.createDevice.devInstGuid;
+       dev->channel_bytes = msg->cmd.createDevice.channelBytes;
 
        read_lock(&BusListLock);
        for (bus = BusListHead; bus; bus = bus->next) {
@@ -442,7 +442,7 @@ create_device(CONTROLVM_MESSAGE *msg, char *buf)
                        if (!msg->hdr.Flags.server) {
                                struct guest_msgs cmd;
 
-                               if (!uuid_le_cmp(dev->channelTypeGuid,
+                               if (!uuid_le_cmp(dev->channel_uuid,
                                     UltraVhbaChannelProtocolGuid)) {
                                        wait_for_valid_guid(&((CHANNEL_HEADER
                                                              __iomem *) (dev->
@@ -464,10 +464,10 @@ create_device(CONTROLVM_MESSAGE *msg, char *buf)
                                        cmd.add_vhba.busNo = busNo;
                                        cmd.add_vhba.deviceNo = devNo;
                                        cmd.add_vhba.devInstGuid =
-                                           dev->devInstGuid;
+                                           dev->instance_uuid;
                                        cmd.add_vhba.intr = dev->intr;
                                } else
-                                   if (!uuid_le_cmp(dev->channelTypeGuid,
+                                   if (!uuid_le_cmp(dev->channel_uuid,
                                         UltraVnicChannelProtocolGuid)) {
                                        wait_for_valid_guid(&((CHANNEL_HEADER
                                                              __iomem *) (dev->
@@ -489,7 +489,7 @@ create_device(CONTROLVM_MESSAGE *msg, char *buf)
                                        cmd.add_vnic.busNo = busNo;
                                        cmd.add_vnic.deviceNo = devNo;
                                        cmd.add_vnic.devInstGuid =
-                                           dev->devInstGuid;
+                                           dev->instance_uuid;
                                        cmd.add_vhba.intr = dev->intr;
                                } else {
                                        LOGERR("CONTROLVM_DEVICE_CREATE Failed: unknown channelTypeGuid.\n");
@@ -584,11 +584,11 @@ pause_device(CONTROLVM_MESSAGE *msg)
                /* the msg is bound for virtpci; send
                 * guest_msgs struct to callback
                 */
-               if (!uuid_le_cmp(dev->channelTypeGuid,
+               if (!uuid_le_cmp(dev->channel_uuid,
                                UltraVhbaChannelProtocolGuid)) {
                        cmd.msgtype = GUEST_PAUSE_VHBA;
                        cmd.pause_vhba.chanptr = dev->chanptr;
-               } else if (!uuid_le_cmp(dev->channelTypeGuid,
+               } else if (!uuid_le_cmp(dev->channel_uuid,
                                        UltraVnicChannelProtocolGuid)) {
                        cmd.msgtype = GUEST_PAUSE_VNIC;
                        cmd.pause_vnic.chanptr = dev->chanptr;
@@ -653,11 +653,11 @@ resume_device(CONTROLVM_MESSAGE *msg)
         * guest_msgs struct to callback
         */
        if (retval == CONTROLVM_RESP_SUCCESS) {
-               if (!uuid_le_cmp(dev->channelTypeGuid,
+               if (!uuid_le_cmp(dev->channel_uuid,
                                 UltraVhbaChannelProtocolGuid)) {
                        cmd.msgtype = GUEST_RESUME_VHBA;
                        cmd.resume_vhba.chanptr = dev->chanptr;
-               } else if (!uuid_le_cmp(dev->channelTypeGuid,
+               } else if (!uuid_le_cmp(dev->channel_uuid,
                                        UltraVnicChannelProtocolGuid)) {
                        cmd.msgtype = GUEST_RESUME_VNIC;
                        cmd.resume_vnic.chanptr = dev->chanptr;
@@ -723,11 +723,11 @@ destroy_device(CONTROLVM_MESSAGE *msg, char *buf)
                /* the msg is bound for virtpci; send
                 * guest_msgs struct to callback
                 */
-               if (!uuid_le_cmp(dev->channelTypeGuid,
+               if (!uuid_le_cmp(dev->channel_uuid,
                                 UltraVhbaChannelProtocolGuid)) {
                        cmd.msgtype = GUEST_DEL_VHBA;
                        cmd.del_vhba.chanptr = dev->chanptr;
-               } else if (!uuid_le_cmp(dev->channelTypeGuid,
+               } else if (!uuid_le_cmp(dev->channel_uuid,
                                        UltraVnicChannelProtocolGuid)) {
                        cmd.msgtype = GUEST_DEL_VNIC;
                        cmd.del_vnic.chanptr = dev->chanptr;