drivers/net: Move && and || to end of previous line

[mirror_ubuntu-artful-kernel.git] / drivers / net / irda / stir4200.c

diff --git a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c
index 528767dec9d7c8b50d143ad79e054e5358771640..e5698fa30a4f262e3538af06c436a289911ecf63 100644 (file)
--- a/drivers/net/irda/stir4200.c
+++ b/drivers/net/irda/stir4200.c
@@ -612,16 +612,16 @@ static int fifo_txwait(struct stir_cb *stir, int space)
                pr_debug("fifo status 0x%lx count %lu\n", status, count);
 
                /* is fifo receiving already, or empty */
-               if (!(status & FIFOCTL_DIR)
-                   || (status & FIFOCTL_EMPTY))
+               if (!(status & FIFOCTL_DIR) ||
+                   (status & FIFOCTL_EMPTY))
                        return 0;
 
                if (signal_pending(current))
                        return -EINTR;
 
                /* shutting down? */
-               if (!netif_running(stir->netdev)
-                   || !netif_device_present(stir->netdev))
+               if (!netif_running(stir->netdev) ||
+                   !netif_device_present(stir->netdev))
                        return -ESHUTDOWN;
 
                /* only waiting for some space */
@@ -776,8 +776,8 @@ static int stir_transmit_thread(void *arg)
                }
 
                /* nothing to send? start receiving */
-               if (!stir->receiving 
-                   && irda_device_txqueue_empty(dev)) {
+               if (!stir->receiving &&
+                   irda_device_txqueue_empty(dev)) {
                        /* Wait otherwise chip gets confused. */
                        if (fifo_txwait(stir, -1))
                                break;