[PATCH 10/13] staging: most: fix logical operator position
Christian Gromm
christian.gromm at microchip.com
Wed Oct 21 15:50:48 UTC 2015
This patch puts logical continuations on the previous line to meet
coding style.
Signed-off-by: Christian Gromm <christian.gromm at microchip.com>
---
drivers/staging/most/aim-cdev/cdev.c | 7 +++----
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 cd122b5..026e1a5 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;
@@ -234,8 +234,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 d5e0572..3e1cc5a 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;
--
1.7.9.5
More information about the devel
mailing list