diff options
| author | Vincent Bernat <vincent@bernat.im> | 2014-07-16 15:19:42 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-16 13:27:06 -0700 |
| commit | 91d421945b02c8ac611481c3ec1008d30ecb9b5f (patch) | |
| tree | 889d368302b42fc1362b34e6cc4d157f86b52d12 /drivers/staging/xillybus | |
| parent | 4168ac9db7ee98634e7fa15c58ec2165ab80e1a0 (diff) | |
| download | linux-91d421945b02c8ac611481c3ec1008d30ecb9b5f.tar.bz2 | |
staging: xillybus: fix some coding style errors
This includes:
- keep "else" on the same line as the closing brace
- don't use "else" after "return"
- don't issue a message for an out-of-memory error
- blank line after a declaration
Signed-off-by: Vincent Bernat <vincent@bernat.im>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/xillybus')
| -rw-r--r-- | drivers/staging/xillybus/xillybus_core.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/staging/xillybus/xillybus_core.c b/drivers/staging/xillybus/xillybus_core.c index ab6502caa72c..2d59734744e5 100644 --- a/drivers/staging/xillybus/xillybus_core.c +++ b/drivers/staging/xillybus/xillybus_core.c @@ -138,7 +138,6 @@ irqreturn_t xillybus_isr(int irq, void *data) * guaranteed no interrupt will occur, but in theory, the cache * lines may not be updated. So a memory barrier is issued. */ - smp_rmb(); buf = ep->msgbuf_addr; @@ -546,8 +545,7 @@ static int xilly_setupchannels(struct xilly_endpoint *ep, channel->rd_buffers = buffers; rc = xilly_get_dma_buffers(ep, &rd_alloc, buffers, bufnum, bytebufsize); - } - else if (channelnum > 0) { + } else if (channelnum > 0) { channel->num_wr_buffers = bufnum; channel->seekable = seekable; @@ -610,8 +608,8 @@ static void xilly_scan_idt(struct xilly_endpoint *endpoint, "IDT device name list overflow. Aborting.\n"); idt_handle->chandesc = NULL; return; - } else - idt_handle->chandesc = scan; + } + idt_handle->chandesc = scan; len = endpoint->idtlen - (3 + ((int) (scan - idt))); @@ -722,6 +720,7 @@ static ssize_t xillybus_read(struct file *filp, char __user *userbuf, while (1) { /* Note that we may drop mutex within this loop */ int bytes_to_do = count - bytes_done; + spin_lock_irqsave(&channel->wr_spinlock, flags); empty = channel->wr_empty; @@ -1963,10 +1962,8 @@ struct xilly_endpoint *xillybus_init_endpoint(struct pci_dev *pdev, struct xilly_endpoint *endpoint; endpoint = devm_kzalloc(dev, sizeof(*endpoint), GFP_KERNEL); - if (!endpoint) { - dev_err(dev, "Failed to allocate memory. Aborting.\n"); + if (!endpoint) return NULL; - } endpoint->pdev = pdev; endpoint->dev = dev; |