drivers/net: Move && and || to end of previous line
Only files where David Miller is the primary git-signer. wireless, wimax, ixgbe, etc are not modified. Compile tested x86 allyesconfig only Not all files compiled (not x86 compatible) Added a few > 80 column lines, which I ignored. Existing checkpatch complaints ignored. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
3454f83583
commit
8e95a2026f
@@ -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;
|
||||
|
Reference in New Issue
Block a user