staging: unisys: fix CamelCase members of virtpci_dev

Fix CamelCase names in this structure:

busNo => bus_no
deviceNo => device_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/virthba/virthba.c b/drivers/staging/unisys/virthba/virthba.c
index ee1be5a83e39529a4213f7fa7d059d100e32866a..04d3c213205fa4ffe58eefc541dab7f75de7b740 100644 (file)
--- a/drivers/staging/unisys/virthba/virthba.c
+++ b/drivers/staging/unisys/virthba/virthba.c
@@ -466,12 +466,12 @@ virthba_probe(struct virtpci_dev *virtpcidev, const struct pci_device_id *id)
        u64 mask;
 
        LOGVER("entering virthba_probe...\n");
-       LOGVER("virtpcidev busNo<<%d>>devNo<<%d>>", virtpcidev->busNo,
-              virtpcidev->deviceNo);
+       LOGVER("virtpcidev bus_no<<%d>>devNo<<%d>>", virtpcidev->bus_no,
+              virtpcidev->device_no);
 
        LOGINF("entering virthba_probe...\n");
-       LOGINF("virtpcidev busNo<<%d>>devNo<<%d>>", virtpcidev->busNo,
-              virtpcidev->deviceNo);
+       LOGINF("virtpcidev bus_no<<%d>>devNo<<%d>>", virtpcidev->bus_no,
+              virtpcidev->device_no);
        POSTCODE_LINUX_2(VHBA_PROBE_ENTRY_PC, POSTCODE_SEVERITY_INFO);
        /* call scsi_host_alloc to register a scsi host adapter
         * instance - this virthba that has just been created is an
@@ -649,8 +649,8 @@ virthba_remove(struct virtpci_dev *virtpcidev)
        struct Scsi_Host *scsihost =
            (struct Scsi_Host *) virtpcidev->scsi.scsihost;
 
-       LOGINF("virtpcidev busNo<<%d>>devNo<<%d>>", virtpcidev->busNo,
-              virtpcidev->deviceNo);
+       LOGINF("virtpcidev bus_no<<%d>>devNo<<%d>>", virtpcidev->bus_no,
+              virtpcidev->device_no);
        virthbainfo = (struct virthba_info *) scsihost->hostdata;
        if (virthbainfo->interrupt_vector != -1)
                free_irq(virthbainfo->interrupt_vector, virthbainfo);
@@ -1482,8 +1482,8 @@ virthba_serverup(struct virtpci_dev *virtpcidev)
            (struct virthba_info *) ((struct Scsi_Host *) virtpcidev->scsi.
                                     scsihost)->hostdata;
 
-       DBGINF("virtpcidev busNo<<%d>>devNo<<%d>>", virtpcidev->busNo,
-              virtpcidev->deviceNo);
+       DBGINF("virtpcidev bus_no<<%d>>devNo<<%d>>", virtpcidev->bus_no,
+              virtpcidev->device_no);
 
        if (!virthbainfo->serverdown) {
                DBGINF("Server up message received while server is already up.\n");
@@ -1573,13 +1573,13 @@ virthba_serverdown_complete(struct work_struct *work)
 
        virtpcidev = virthbainfo->virtpcidev;
 
-       DBGINF("virtpcidev busNo<<%d>>devNo<<%d>>", virtpcidev->busNo,
-              virtpcidev->deviceNo);
+       DBGINF("virtpcidev bus_no<<%d>>devNo<<%d>>", virtpcidev->bus_no,
+              virtpcidev->device_no);
        virthbainfo->serverdown = true;
        virthbainfo->serverchangingstate = false;
        /* Return the ServerDown response to Command */
-       visorchipset_device_pause_response(virtpcidev->busNo,
-                                          virtpcidev->deviceNo, 0);
+       visorchipset_device_pause_response(virtpcidev->bus_no,
+                                          virtpcidev->device_no, 0);
 }
 
 /* As per VirtpciFunc returns 1 for success and 0 for failure */
@@ -1591,8 +1591,8 @@ virthba_serverdown(struct virtpci_dev *virtpcidev, u32 state)
                                     scsihost)->hostdata;
 
        DBGINF("virthba_serverdown");
-       DBGINF("virtpcidev busNo<<%d>>devNo<<%d>>", virtpcidev->busNo,
-              virtpcidev->deviceNo);
+       DBGINF("virtpcidev bus_no<<%d>>devNo<<%d>>", virtpcidev->bus_no,
+              virtpcidev->device_no);
 
        if (!virthbainfo->serverdown && !virthbainfo->serverchangingstate) {
                virthbainfo->serverchangingstate = true;

diff --git a/drivers/staging/unisys/virtpci/virtpci.c b/drivers/staging/unisys/virtpci/virtpci.c
index 430ad6c83e9acb3c196aa82b294794229fdfab28..52ec69f06b921a6d1a32de380095922fadcc1c74 100644 (file)
--- a/drivers/staging/unisys/virtpci/virtpci.c
+++ b/drivers/staging/unisys/virtpci/virtpci.c
@@ -843,7 +843,7 @@ static int virtpci_device_probe(struct device *dev)
                 */
                error = virtpcidrv->probe(virtpcidev, id);
                if (!error) {
-                       fix_vbus_devInfo(dev, virtpcidev->deviceNo,
+                       fix_vbus_devInfo(dev, virtpcidev->device_no,
                                         virtpcidev->device, virtpcidrv);
                        virtpcidev->mydriver = virtpcidrv;
                        POSTCODE_LINUX_2(VPCI_PROBE_EXIT_PC,
@@ -940,8 +940,8 @@ static int virtpci_device_add(struct device *parentbus, int devtype,
                virtpcidev->net = *net;
        }
        virtpcidev->vendor = PCI_VENDOR_ID_UNISYS;
-       virtpcidev->busNo = addparams->bus_no;
-       virtpcidev->deviceNo = addparams->device_no;
+       virtpcidev->bus_no = addparams->bus_no;
+       virtpcidev->device_no = addparams->device_no;
 
        virtpcidev->queueinfo.chan = addparams->chanptr;
        virtpcidev->queueinfo.send_int_if_needed = NULL;
@@ -1173,7 +1173,8 @@ static int virtpci_device_serverup(struct device *parentbus,
                * ever have a bus that contains NO devices, since we
                * would never even get here in that case.
                */
-               fix_vbus_devInfo(&tmpvpcidev->generic_dev, tmpvpcidev->deviceNo,
+               fix_vbus_devInfo(&tmpvpcidev->generic_dev,
+                                tmpvpcidev->device_no,
                                 tmpvpcidev->device, vpcidriver);
                rc = vpcidriver->resume(tmpvpcidev);
        }
@@ -1458,7 +1459,8 @@ static ssize_t info_debugfs_read(struct file *file, char __user *buf,
                if (tmpvpcidev->devtype == VIRTHBA_TYPE) {
                        str_pos += scnprintf(vbuf + str_pos, len - str_pos,
                                        "[%d:%d] VHba:%08x:%08x max-config:%d-%d-%d-%d",
-                                       tmpvpcidev->busNo, tmpvpcidev->deviceNo,
+                                       tmpvpcidev->bus_no,
+                                       tmpvpcidev->device_no,
                                        tmpvpcidev->scsi.wwnn.wwnn1,
                                        tmpvpcidev->scsi.wwnn.wwnn2,
                                        tmpvpcidev->scsi.max.max_channel,
@@ -1468,7 +1470,8 @@ static ssize_t info_debugfs_read(struct file *file, char __user *buf,
                } else {
                        str_pos += scnprintf(vbuf + str_pos, len - str_pos,
                                        "[%d:%d] VNic:%02x:%02x:%02x:%02x:%02x:%02x num_rcv_bufs:%d mtu:%d",
-                                       tmpvpcidev->busNo, tmpvpcidev->deviceNo,
+                                       tmpvpcidev->bus_no,
+                                       tmpvpcidev->device_no,
                                        tmpvpcidev->net.mac_addr[0],
                                        tmpvpcidev->net.mac_addr[1],
                                        tmpvpcidev->net.mac_addr[2],

diff --git a/drivers/staging/unisys/virtpci/virtpci.h b/drivers/staging/unisys/virtpci/virtpci.h
index 49025458a1d6f669aa2740f4d3c18565f2d6db2d..42a98de47e1d6da00dc962b896fedfdbb9f200ec 100644 (file)
--- a/drivers/staging/unisys/virtpci/virtpci.h
+++ b/drivers/staging/unisys/virtpci/virtpci.h
@@ -58,8 +58,8 @@ struct virtpci_dev {
                                                 * this device */
        unsigned short vendor;  /* vendor id for device */
        unsigned short device;  /* device id for device */
-       u32 busNo;              /* number of bus on which device exists */
-       u32 deviceNo;           /* device's number on the bus */
+       u32 bus_no;             /* number of bus on which device exists */
+       u32 device_no;          /* device's number on the bus */
        struct irq_info intr;   /* interrupt info */
        struct device generic_dev;      /* generic device */
        union {