diff options
| author | Christian Gromm | 2015-10-21 17:50:48 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-10-25 03:08:20 +0100 |
| commit | 623d800252111942d357d8d8592d578d3783ff67 (patch) | |
| tree | 1c18c102e51c98a32da43b6a58ab273e11d940d8 | |
| parent | staging: most: remove unnecessary parentheses (diff) | |
| download | kernel-qcow2-linux-623d800252111942d357d8d8592d578d3783ff67.tar.gz kernel-qcow2-linux-623d800252111942d357d8d8592d578d3783ff67.tar.xz kernel-qcow2-linux-623d800252111942d357d8d8592d578d3783ff67.zip | |
staging: most: fix logical operator position
This patch puts logical continuations on the previous line to meet
coding style.
Signed-off-by: Christian Gromm <christian.gromm@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/most/aim-cdev/cdev.c | 7 | ||||
| -rw-r--r-- | drivers/staging/most/mostcore/core.c | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/drivers/staging/most/aim-cdev/cdev.c b/drivers/staging/most/aim-cdev/cdev.c index 7bf4f61435c8..4dd1434b8060 100644 --- a/drivers/staging/most/aim-cdev/cdev.c +++ b/drivers/staging/most/aim-cdev/cdev.c @@ -88,8 +88,8 @@ static int aim_open(struct inode *inode, struct file *filp) filp->private_data = channel; if (((channel->cfg->direction == MOST_CH_RX) && - ((filp->f_flags & O_ACCMODE) != O_RDONLY)) - || ((channel->cfg->direction == MOST_CH_TX) && + ((filp->f_flags & O_ACCMODE) != O_RDONLY)) || + ((channel->cfg->direction == MOST_CH_TX) && ((filp->f_flags & O_ACCMODE) != O_WRONLY))) { pr_info("WARN: Access flags mismatch\n"); return -EACCES; @@ -233,8 +233,7 @@ aim_read(struct file *filp, char __user *buf, size_t count, loff_t *offset) channel->keep_mbo = false; goto start_copy; } - while ((!kfifo_out(&channel->fifo, &mbo, 1)) - && (channel->dev)) { + while ((!kfifo_out(&channel->fifo, &mbo, 1)) && (channel->dev)) { if (filp->f_flags & O_NONBLOCK) return -EAGAIN; if (wait_event_interruptible(channel->wq, diff --git a/drivers/staging/most/mostcore/core.c b/drivers/staging/most/mostcore/core.c index d5e05724fb16..3e1cc5acf8df 100644 --- a/drivers/staging/most/mostcore/core.c +++ b/drivers/staging/most/mostcore/core.c @@ -1184,8 +1184,8 @@ static int hdm_enqueue_thread(void *data) while (likely(!kthread_should_stop())) { wait_event_interruptible(c->hdm_fifo_wq, - (mbo = get_hdm_mbo(c)) - || kthread_should_stop()); + (mbo = get_hdm_mbo(c)) || + kthread_should_stop()); if (unlikely(!mbo)) continue; |