diff options
| author | Eli Billauer <eli.billauer@gmail.com> | 2014-09-04 17:47:55 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-08 13:58:19 -0700 |
| commit | 79ae92c436f216112a543ab4e62e8b512c9526e5 (patch) | |
| tree | b1903265865716b80158b2831b13d22c93bf0bc9 | |
| parent | d3274f20df58f58bab86a6b28c90676f75feb525 (diff) | |
| download | linux-79ae92c436f216112a543ab4e62e8b512c9526e5.tar.bz2 | |
staging: xillybus: Trivial coding style fixes
Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Eli Billauer <eli.billauer@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/xillybus/xillybus_core.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/staging/xillybus/xillybus_core.c b/drivers/staging/xillybus/xillybus_core.c index 53ec54264dc4..ffc6f229c97b 100644 --- a/drivers/staging/xillybus/xillybus_core.c +++ b/drivers/staging/xillybus/xillybus_core.c @@ -407,8 +407,7 @@ static int xilly_get_dma_buffers(struct xilly_endpoint *ep, static int xilly_setupchannels(struct xilly_endpoint *ep, unsigned char *chandesc, - int entries - ) + int entries) { struct device *dev = ep->dev; int i, entry, rc; @@ -784,8 +783,8 @@ static ssize_t xillybus_read(struct file *filp, char __user *userbuf, * the channel-specific mutex. */ - iowrite32(1 | (channel->chan_num << 1) - | (bufidx << 12), + iowrite32(1 | (channel->chan_num << 1) | + (bufidx << 12), channel->endpoint->registers + fpga_buf_ctrl_reg); } |