staging: unisys: fix CamelCase name for struct InterruptInfo

Fix CamelCase names:
InterruptInfo => irq_info

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/controlvmchannel.h b/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h
index 8c32be2..cbe152f 100644 (file)
--- a/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h
+++ b/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h
@@ -119,7 +119,7 @@ typedef enum  {
 
 } CONTROLVM_ID;
 
-struct InterruptInfo {
+struct irq_info {
         /**< specifies interrupt info. It is used to send interrupts
          *   for this channel. The peer at the end of this channel
          *   who has registered an interrupt (using recv fields
@@ -298,7 +298,7 @@ typedef struct _CONTROLVM_PACKET_DEVICE_CREATE  {
        u64 channelBytes; /**< specifies size of the channel in bytes */
        uuid_le dataTypeGuid;/**< specifies format of data in channel */
        uuid_le devInstGuid; /**< instance guid for the device */
-       struct InterruptInfo intr; /**< specifies interrupt information */
+       struct irq_info intr; /**< specifies interrupt information */
 } CONTROLVM_PACKET_DEVICE_CREATE;      /* for CONTROLVM_DEVICE_CREATE */
 
 typedef struct _CONTROLVM_PACKET_DEVICE_CONFIGURE  {

diff --git a/drivers/staging/unisys/include/uisqueue.h b/drivers/staging/unisys/include/uisqueue.h
index 8c307cf..cde29a2 100644 (file)
--- a/drivers/staging/unisys/include/uisqueue.h
+++ b/drivers/staging/unisys/include/uisqueue.h
@@ -132,7 +132,7 @@ struct device_info {
        u64 channel_bytes;
        uuid_le channel_uuid;
        uuid_le instance_uuid;
-       struct InterruptInfo intr;
+       struct irq_info intr;
        struct switch_info *swtch;
        char devid[30];         /* "vbus<busno>:dev<devno>" */
        u16 polling;
@@ -226,7 +226,7 @@ struct add_virt_iopart {
                                 * for DMA, for ex. */
        u64 recv_bus_irq_handle;        /* used to register to receive
                                         * bus level interrupts. */
-       struct InterruptInfo intr;      /* contains recv & send
+       struct irq_info intr;   /* contains recv & send
                                         * interrupt info */
        /* recvInterruptHandle is used to register to receive
        * interrupts on the data channel. Used by GuestLinux/Windows
@@ -364,7 +364,7 @@ struct add_virt_guestpart {
        u32 bus_no;             /* bus number for the operation */
        u32 device_no;          /* number of device on the bus */
        uuid_le instance_uuid;  /* instance guid for device */
-       struct InterruptInfo intr;      /* recv/send interrupt info */
+       struct irq_info intr;   /* recv/send interrupt info */
        /* recvInterruptHandle contains info needed in order to
         * register to receive interrupts on the data channel.
         * sendInterruptHandle contains handle which is provided to

diff --git a/drivers/staging/unisys/include/uisutils.h b/drivers/staging/unisys/include/uisutils.h
index 54427a2..d6859c6 100644 (file)
--- a/drivers/staging/unisys/include/uisutils.h
+++ b/drivers/staging/unisys/include/uisutils.h
@@ -139,14 +139,14 @@ int  uislib_client_inject_del_bus(u32 bus_no);
 int uislib_client_inject_add_vhba(u32 bus_no, u32 dev_no,
                                  u64 phys_chan_addr, u32 chan_bytes,
                                  int is_test_addr, uuid_le inst_uuid,
-                                 struct InterruptInfo *intr);
+                                 struct irq_info *intr);
 int  uislib_client_inject_pause_vhba(u32 bus_no, u32 dev_no);
 int  uislib_client_inject_resume_vhba(u32 bus_no, u32 dev_no);
 int uislib_client_inject_del_vhba(u32 bus_no, u32 dev_no);
 int uislib_client_inject_add_vnic(u32 bus_no, u32 dev_no,
                                  u64 phys_chan_addr, u32 chan_bytes,
                                  int is_test_addr, uuid_le inst_uuid,
-                                 struct InterruptInfo *intr);
+                                 struct irq_info *intr);
 int uislib_client_inject_pause_vnic(u32 bus_no, u32 dev_no);
 int uislib_client_inject_resume_vnic(u32 bus_no, u32 dev_no);
 int uislib_client_inject_del_vnic(u32 bus_no, u32 dev_no);

diff --git a/drivers/staging/unisys/uislib/uislib.c b/drivers/staging/unisys/uislib/uislib.c
index 3d32c43..b1f6c6e 100644 (file)
--- a/drivers/staging/unisys/uislib/uislib.c
+++ b/drivers/staging/unisys/uislib/uislib.c
@@ -925,7 +925,7 @@ int
 uislib_client_inject_add_vhba(u32 bus_no, u32 dev_no,
                              u64 phys_chan_addr, u32 chan_bytes,
                              int is_test_addr, uuid_le inst_uuid,
-                             struct InterruptInfo *intr)
+                             struct irq_info *intr)
 {
        CONTROLVM_MESSAGE msg;
 
@@ -950,7 +950,7 @@ uislib_client_inject_add_vhba(u32 bus_no, u32 dev_no,
                msg.cmd.createDevice.intr = *intr;
        else
                memset(&msg.cmd.createDevice.intr, 0,
-                      sizeof(struct InterruptInfo));
+                      sizeof(struct irq_info));
        msg.cmd.createDevice.channelAddr = phys_chan_addr;
        if (chan_bytes < MIN_IO_CHANNEL_SIZE) {
                LOGERR("wrong channel size.chan_bytes = 0x%x IO_CHANNEL_SIZE= 0x%x\n",
@@ -984,7 +984,7 @@ int
 uislib_client_inject_add_vnic(u32 bus_no, u32 dev_no,
                              u64 phys_chan_addr, u32 chan_bytes,
                              int is_test_addr, uuid_le inst_uuid,
-                             struct InterruptInfo *intr)
+                             struct irq_info *intr)
 {
        CONTROLVM_MESSAGE msg;
 
@@ -1009,7 +1009,7 @@ uislib_client_inject_add_vnic(u32 bus_no, u32 dev_no,
                msg.cmd.createDevice.intr = *intr;
        else
                memset(&msg.cmd.createDevice.intr, 0,
-                      sizeof(struct InterruptInfo));
+                      sizeof(struct irq_info));
        msg.cmd.createDevice.channelAddr = phys_chan_addr;
        if (chan_bytes < MIN_IO_CHANNEL_SIZE) {
                LOGERR("wrong channel size.chan_bytes = 0x%x IO_CHANNEL_SIZE= 0x%x\n",
@@ -1106,7 +1106,7 @@ uislib_client_add_vnic(u32 busNo)
        msg.cmd.createDevice.busNo = busNo;
        msg.cmd.createDevice.devNo = devNo;
        msg.cmd.createDevice.devInstGuid = NULL_UUID_LE;
-       memset(&msg.cmd.createDevice.intr, 0, sizeof(struct InterruptInfo));
+       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;

diff --git a/drivers/staging/unisys/virthba/virthba.c b/drivers/staging/unisys/virthba/virthba.c
index 938e2c8..e4130c9 100644 (file)
--- a/drivers/staging/unisys/virthba/virthba.c
+++ b/drivers/staging/unisys/virthba/virthba.c
@@ -172,7 +172,7 @@ struct virthba_info {
        struct virtpci_dev *virtpcidev;
        struct list_head dev_info_list;
        struct chaninfo chinfo;
-       struct InterruptInfo intr;      /* use recvInterrupt info to receive
+       struct irq_info intr;           /* use recvInterrupt info to receive
                                           interrupts when IOs complete */
        int interrupt_vector;
        struct scsipending pending[MAX_PENDING_REQUESTS]; /* Tracks the requests

diff --git a/drivers/staging/unisys/virtpci/virtpci.h b/drivers/staging/unisys/virtpci/virtpci.h
index 6e26956..8a0d439 100644 (file)
--- a/drivers/staging/unisys/virtpci/virtpci.h
+++ b/drivers/staging/unisys/virtpci/virtpci.h
@@ -60,7 +60,7 @@ struct virtpci_dev {
        unsigned short device;  /* device id for device */
        u32 busNo;              /* number of bus on which device exists */
        u32 deviceNo;           /* device's number on the bus */
-       struct InterruptInfo intr;      /* interrupt info */
+       struct irq_info intr;   /* interrupt info */
        struct device generic_dev;      /* generic device */
        union {
                struct scsi_adap_info scsi;

diff --git a/drivers/staging/unisys/visorchipset/visorchipset.h b/drivers/staging/unisys/visorchipset/visorchipset.h
index 2bf2e2f..af35728 100644 (file)
--- a/drivers/staging/unisys/visorchipset/visorchipset.h
+++ b/drivers/staging/unisys/visorchipset/visorchipset.h
@@ -63,7 +63,7 @@ typedef enum {
 typedef struct {
        VISORCHIPSET_ADDRESSTYPE addrType;
        HOSTADDRESS channelAddr;
-       struct InterruptInfo intr;
+       struct irq_info intr;
        u64 nChannelBytes;
        uuid_le channelTypeGuid;
        uuid_le channelInstGuid;