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

staging: unisys: virtpci: Fix CamelCase local variables in virtpci_device_add()

Rename the following local variables in virtpci_device_add()
pIoChan changed to io_chan
pDev changed to dev
Signed-off-by: default avatarBryan Thompson <bryan.thompson@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a87606c7
...@@ -910,8 +910,8 @@ static int virtpci_device_add(struct device *parentbus, int devtype, ...@@ -910,8 +910,8 @@ static int virtpci_device_add(struct device *parentbus, int devtype,
struct virtpci_dev *tmpvpcidev = NULL, *prev; struct virtpci_dev *tmpvpcidev = NULL, *prev;
unsigned long flags; unsigned long flags;
int ret; int ret;
struct spar_io_channel_protocol __iomem *pIoChan = NULL; struct spar_io_channel_protocol __iomem *io_chan = NULL;
struct device *pDev; struct device *dev;
LOGINF("virtpci_device_add parentbus:%p chanptr:%p\n", parentbus, LOGINF("virtpci_device_add parentbus:%p chanptr:%p\n", parentbus,
addparams->chanptr); addparams->chanptr);
...@@ -951,7 +951,7 @@ static int virtpci_device_add(struct device *parentbus, int devtype, ...@@ -951,7 +951,7 @@ static int virtpci_device_add(struct device *parentbus, int devtype,
virtpcidev->queueinfo.send_int_if_needed = NULL; virtpcidev->queueinfo.send_int_if_needed = NULL;
/* Set up safe queue... */ /* Set up safe queue... */
pIoChan = (struct spar_io_channel_protocol __iomem *) io_chan = (struct spar_io_channel_protocol __iomem *)
virtpcidev->queueinfo.chan; virtpcidev->queueinfo.chan;
virtpcidev->intr = addparams->intr; virtpcidev->intr = addparams->intr;
...@@ -1013,9 +1013,9 @@ static int virtpci_device_add(struct device *parentbus, int devtype, ...@@ -1013,9 +1013,9 @@ static int virtpci_device_add(struct device *parentbus, int devtype,
* registering the device, because polling of the channel * registering the device, because polling of the channel
* queues can begin at any time after device_register(). * queues can begin at any time after device_register().
*/ */
pDev = &virtpcidev->generic_dev; dev = &virtpcidev->generic_dev;
SPAR_CHANNEL_CLIENT_TRANSITION(addparams->chanptr, SPAR_CHANNEL_CLIENT_TRANSITION(addparams->chanptr,
BUS_ID(pDev), BUS_ID(dev),
CHANNELCLI_ATTACHED, NULL); CHANNELCLI_ATTACHED, NULL);
/* don't register until device has been added to /* don't register until device has been added to
...@@ -1036,9 +1036,9 @@ static int virtpci_device_add(struct device *parentbus, int devtype, ...@@ -1036,9 +1036,9 @@ static int virtpci_device_add(struct device *parentbus, int devtype,
*/ */
if (ret) { if (ret) {
LOGERR("device_register returned %d\n", ret); LOGERR("device_register returned %d\n", ret);
pDev = &virtpcidev->generic_dev; dev = &virtpcidev->generic_dev;
SPAR_CHANNEL_CLIENT_TRANSITION(addparams->chanptr, SPAR_CHANNEL_CLIENT_TRANSITION(addparams->chanptr,
BUS_ID(pDev), BUS_ID(dev),
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(&vpcidev_list_lock, flags); write_lock_irqsave(&vpcidev_list_lock, flags);
......
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