diff options
| author |   Mahati Chamarthy <mahati.chamarthy@gmail.com> | 2014-09-29 15:49:25 +0530 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-02 09:39:33 -0700 |
| commit | 1cd36ed5b4f9480e4515c13900b142e7d3a23516 (patch) | |
| tree | 7428352e26b774a60ef526e5387aeadc15868074 /drivers/staging | |
| parent | staging: dgnc: Fix do not add new typedefs (diff) | |
| download | linux-dev-1cd36ed5b4f9480e4515c13900b142e7d3a23516.tar.xz linux-dev-1cd36ed5b4f9480e4515c13900b142e7d3a23516.zip | |
Staging: unisys: Add missing blank line
This fixes the following checkpatch.pl warning:
WARNING: Missing a blank line after declarations
Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/unisys/virtpci/virtpci.c | 8 | ||||
| -rw-r--r-- | drivers/staging/unisys/visorchannel/visorchannel_funcs.c | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/drivers/staging/unisys/virtpci/virtpci.c b/drivers/staging/unisys/virtpci/virtpci.c index 261a52f20ba7..2758c47acc30 100644 --- a/drivers/staging/unisys/virtpci/virtpci.c +++ b/drivers/staging/unisys/virtpci/virtpci.c @@ -174,6 +174,7 @@ static inline int WAIT_FOR_IO_CHANNEL(ULTRA_IO_CHANNEL_PROTOCOL __iomem *chanptr) { int count = 120; + while (count > 0) { if (ULTRA_CHANNEL_SERVER_READY(&chanptr->ChannelHeader)) @@ -189,6 +190,7 @@ static int write_vbus_chpInfo(ULTRA_VBUS_CHANNEL_PROTOCOL *chan, ULTRA_VBUS_DEVICEINFO *info) { int off; + if (!chan) { LOGERR("vbus channel not present"); return -1; @@ -207,6 +209,7 @@ static int write_vbus_busInfo(ULTRA_VBUS_CHANNEL_PROTOCOL *chan, ULTRA_VBUS_DEVICEINFO *info) { int off; + if (!chan) { LOGERR("vbus channel not present"); return -1; @@ -228,6 +231,7 @@ write_vbus_devInfo(ULTRA_VBUS_CHANNEL_PROTOCOL *chan, ULTRA_VBUS_DEVICEINFO *info, int devix) { int off; + if (!chan) { LOGERR("vbus channel not present"); return -1; @@ -251,6 +255,7 @@ static int add_vbus(struct add_vbus_guestpart *addparams) { int ret; struct device *vbus; + vbus = kzalloc(sizeof(struct device), GFP_ATOMIC); POSTCODE_LINUX_2(VPCI_CREATE_ENTRY_PC, POSTCODE_SEVERITY_INFO); @@ -856,6 +861,7 @@ static int virtpci_device_remove(struct device *dev_) */ struct virtpci_dev *virtpcidev = device_to_virtpci_dev(dev_); struct virtpci_driver *virtpcidrv = virtpcidev->mydriver; + LOGINF("In virtpci_device_remove bus_id:%s dev_:%p virtpcidev:%p dev->driver:%p drivername:%s\n", BUS_ID(dev_), dev_, virtpcidev, dev_->driver, dev_->driver->name); /* VERBOSE/DEBUG */ @@ -1308,6 +1314,7 @@ static ssize_t virtpci_driver_attr_show(struct kobject *kobj, struct driver_private *dprivate = to_driver(kobj); struct device_driver *driver; + if (dprivate != NULL) driver = dprivate->driver; else @@ -1330,6 +1337,7 @@ static ssize_t virtpci_driver_attr_store(struct kobject *kobj, struct driver_private *dprivate = to_driver(kobj); struct device_driver *driver; + if (dprivate != NULL) driver = dprivate->driver; else diff --git a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c index 947b23c1e478..01a44c553500 100644 --- a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c +++ b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c @@ -257,6 +257,7 @@ visorchannel_clear(VISORCHANNEL *channel, ulong offset, u8 ch, ulong nbytes) while (nbytes > 0) { ulong thisbytes = bufsize; int x = -1; + if (nbytes < thisbytes) thisbytes = nbytes; x = visor_memregion_write(channel->memregion, offset + written, @@ -520,6 +521,7 @@ int visorchannel_signalqueue_max_slots(VISORCHANNEL *channel, u32 queue) { SIGNAL_QUEUE_HEADER sig_hdr; + if (!sig_read_header(channel, queue, &sig_hdr)) return 0; return (int) sig_hdr.MaxSignals; @@ -612,6 +614,7 @@ visorchannel_debug(VISORCHANNEL *channel, int nQueues, else for (i = 0; i < nQueues; i++) { SIGNAL_QUEUE_HEADER q; + errcode = visorchannel_read(channel, off + phdr->oChannelSpace + (i * sizeof(q)), |