Commit 8a7281b2 authored by Bryan Thompson's avatar Bryan Thompson Committed by Greg Kroah-Hartman

staging: unisys: virtpci: Fix CamelCase virtpci device list head

Rename VpcidevListHead to vpcidev_list_head in virtpci.c
Signed-off-by: default avatarBryan Thompson <bryan.thompson@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 09b0e276
...@@ -149,7 +149,7 @@ static struct kobj_type virtpci_driver_kobj_type = { ...@@ -149,7 +149,7 @@ static struct kobj_type virtpci_driver_kobj_type = {
.sysfs_ops = &virtpci_driver_sysfs_ops, .sysfs_ops = &virtpci_driver_sysfs_ops,
}; };
static struct virtpci_dev *VpcidevListHead; static struct virtpci_dev *vpcidev_list_head;
static DEFINE_RWLOCK(VpcidevListLock); static DEFINE_RWLOCK(VpcidevListLock);
/* filled in with info about this driver, wrt it servicing client busses */ /* filled in with info about this driver, wrt it servicing client busses */
...@@ -590,8 +590,8 @@ static void delete_all(void) ...@@ -590,8 +590,8 @@ static void delete_all(void)
/* delete the entire vhba/vnic list in one shot */ /* delete the entire vhba/vnic list in one shot */
write_lock_irqsave(&VpcidevListLock, flags); write_lock_irqsave(&VpcidevListLock, flags);
tmpvpcidev = VpcidevListHead; tmpvpcidev = vpcidev_list_head;
VpcidevListHead = NULL; vpcidev_list_head = NULL;
write_unlock_irqrestore(&VpcidevListLock, flags); write_unlock_irqrestore(&VpcidevListLock, flags);
/* delete one vhba/vnic at a time */ /* delete one vhba/vnic at a time */
...@@ -967,7 +967,7 @@ static int virtpci_device_add(struct device *parentbus, int devtype, ...@@ -967,7 +967,7 @@ static int virtpci_device_add(struct device *parentbus, int devtype,
* duplicate wwnn/macaddr first * duplicate wwnn/macaddr first
*/ */
write_lock_irqsave(&VpcidevListLock, flags); write_lock_irqsave(&VpcidevListLock, flags);
for (tmpvpcidev = VpcidevListHead; tmpvpcidev; for (tmpvpcidev = vpcidev_list_head; tmpvpcidev;
tmpvpcidev = tmpvpcidev->next) { tmpvpcidev = tmpvpcidev->next) {
if (devtype == VIRTHBA_TYPE) { if (devtype == VIRTHBA_TYPE) {
if ((tmpvpcidev->scsi.wwnn.wwnn1 == scsi->wwnn.wwnn1) && if ((tmpvpcidev->scsi.wwnn.wwnn1 == scsi->wwnn.wwnn1) &&
...@@ -996,14 +996,14 @@ static int virtpci_device_add(struct device *parentbus, int devtype, ...@@ -996,14 +996,14 @@ static int virtpci_device_add(struct device *parentbus, int devtype,
} }
/* add it at the head */ /* add it at the head */
if (!VpcidevListHead) { if (!vpcidev_list_head) {
VpcidevListHead = virtpcidev; vpcidev_list_head = virtpcidev;
} else { } else {
/* insert virtpcidev at the head of our linked list of /* insert virtpcidev at the head of our linked list of
* vpcidevs * vpcidevs
*/ */
virtpcidev->next = VpcidevListHead; virtpcidev->next = vpcidev_list_head;
VpcidevListHead = virtpcidev; vpcidev_list_head = virtpcidev;
} }
write_unlock_irqrestore(&VpcidevListLock, flags); write_unlock_irqrestore(&VpcidevListLock, flags);
...@@ -1041,14 +1041,14 @@ static int virtpci_device_add(struct device *parentbus, int devtype, ...@@ -1041,14 +1041,14 @@ static int virtpci_device_add(struct device *parentbus, int devtype,
CHANNELCLI_DETACHED, NULL); CHANNELCLI_DETACHED, NULL);
/* remove virtpcidev, the one we just added, from the list */ /* remove virtpcidev, the one we just added, from the list */
write_lock_irqsave(&VpcidevListLock, flags); write_lock_irqsave(&VpcidevListLock, flags);
for (tmpvpcidev = VpcidevListHead, prev = NULL; for (tmpvpcidev = vpcidev_list_head, prev = NULL;
tmpvpcidev; tmpvpcidev;
prev = tmpvpcidev, tmpvpcidev = tmpvpcidev->next) { prev = tmpvpcidev, tmpvpcidev = tmpvpcidev->next) {
if (tmpvpcidev == virtpcidev) { if (tmpvpcidev == virtpcidev) {
if (prev) if (prev)
prev->next = tmpvpcidev->next; prev->next = tmpvpcidev->next;
else else
VpcidevListHead = tmpvpcidev->next; vpcidev_list_head = tmpvpcidev->next;
break; break;
} }
} }
...@@ -1086,7 +1086,7 @@ static int virtpci_device_serverdown(struct device *parentbus, ...@@ -1086,7 +1086,7 @@ static int virtpci_device_serverdown(struct device *parentbus,
/* find the vhba or vnic in virtpci device list */ /* find the vhba or vnic in virtpci device list */
write_lock_irqsave(&VpcidevListLock, flags); write_lock_irqsave(&VpcidevListLock, flags);
for (tmpvpcidev = VpcidevListHead, prevvpcidev = NULL; for (tmpvpcidev = vpcidev_list_head, prevvpcidev = NULL;
(tmpvpcidev && !found); (tmpvpcidev && !found);
prevvpcidev = tmpvpcidev, tmpvpcidev = tmpvpcidev->next) { prevvpcidev = tmpvpcidev, tmpvpcidev = tmpvpcidev->next) {
if (tmpvpcidev->devtype != devtype) if (tmpvpcidev->devtype != devtype)
...@@ -1145,7 +1145,7 @@ static int virtpci_device_serverup(struct device *parentbus, ...@@ -1145,7 +1145,7 @@ static int virtpci_device_serverup(struct device *parentbus,
/* find the vhba or vnic in virtpci device list */ /* find the vhba or vnic in virtpci device list */
write_lock_irqsave(&VpcidevListLock, flags); write_lock_irqsave(&VpcidevListLock, flags);
for (tmpvpcidev = VpcidevListHead, prevvpcidev = NULL; for (tmpvpcidev = vpcidev_list_head, prevvpcidev = NULL;
(tmpvpcidev && !found); (tmpvpcidev && !found);
prevvpcidev = tmpvpcidev, tmpvpcidev = tmpvpcidev->next) { prevvpcidev = tmpvpcidev, tmpvpcidev = tmpvpcidev->next) {
if (tmpvpcidev->devtype != devtype) if (tmpvpcidev->devtype != devtype)
...@@ -1224,7 +1224,7 @@ static int virtpci_device_del(struct device *parentbus, ...@@ -1224,7 +1224,7 @@ static int virtpci_device_del(struct device *parentbus,
* encounter "schedule while atomic" * encounter "schedule while atomic"
*/ */
write_lock_irqsave(&VpcidevListLock, flags); write_lock_irqsave(&VpcidevListLock, flags);
for (tmpvpcidev = VpcidevListHead, prevvpcidev = NULL; tmpvpcidev;) { for (tmpvpcidev = vpcidev_list_head, prevvpcidev = NULL; tmpvpcidev;) {
if (tmpvpcidev->devtype != devtype) if (tmpvpcidev->devtype != devtype)
DEL_CONTINUE; DEL_CONTINUE;
...@@ -1258,7 +1258,7 @@ static int virtpci_device_del(struct device *parentbus, ...@@ -1258,7 +1258,7 @@ static int virtpci_device_del(struct device *parentbus,
/* not at head */ /* not at head */
prevvpcidev->next = tmpvpcidev->next; prevvpcidev->next = tmpvpcidev->next;
else else
VpcidevListHead = tmpvpcidev->next; vpcidev_list_head = tmpvpcidev->next;
/* add it to our deletelist */ /* add it to our deletelist */
tmpvpcidev->next = dellist; tmpvpcidev->next = dellist;
...@@ -1273,7 +1273,7 @@ static int virtpci_device_del(struct device *parentbus, ...@@ -1273,7 +1273,7 @@ static int virtpci_device_del(struct device *parentbus,
if (prevvpcidev) if (prevvpcidev)
tmpvpcidev = prevvpcidev->next; tmpvpcidev = prevvpcidev->next;
else else
tmpvpcidev = VpcidevListHead; tmpvpcidev = vpcidev_list_head;
} }
write_unlock_irqrestore(&VpcidevListLock, flags); write_unlock_irqrestore(&VpcidevListLock, flags);
...@@ -1457,7 +1457,7 @@ static ssize_t info_debugfs_read(struct file *file, char __user *buf, ...@@ -1457,7 +1457,7 @@ static ssize_t info_debugfs_read(struct file *file, char __user *buf,
str_pos += scnprintf(vbuf + str_pos, len - str_pos, str_pos += scnprintf(vbuf + str_pos, len - str_pos,
"\n Virtual PCI devices\n"); "\n Virtual PCI devices\n");
read_lock_irqsave(&VpcidevListLock, flags); read_lock_irqsave(&VpcidevListLock, flags);
tmpvpcidev = VpcidevListHead; tmpvpcidev = vpcidev_list_head;
while (tmpvpcidev) { while (tmpvpcidev) {
if (tmpvpcidev->devtype == VIRTHBA_TYPE) { if (tmpvpcidev->devtype == VIRTHBA_TYPE) {
str_pos += scnprintf(vbuf + str_pos, len - str_pos, str_pos += scnprintf(vbuf + str_pos, len - str_pos,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment