staging: most: fix logical operator position
authorChristian Gromm <christian.gromm@microchip.com>
Wed, 21 Oct 2015 15:50:48 +0000 (17:50 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 25 Oct 2015 02:08:20 +0000 (19:08 -0700)
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>
drivers/staging/most/aim-cdev/cdev.c
drivers/staging/most/mostcore/core.c

index 7bf4f61435c8c4f2e2dfeb8e3e4acaba3814609c..4dd1434b80600a5f64ad84c6989d80a56d2387d5 100644 (file)
@@ -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,
index d5e05724fb16f38286e7eb067457ddba122d56b1..3e1cc5acf8dff7df44b5b538288d0d32410e4944 100644 (file)
@@ -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;