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>

4 files changed, 30 insertions, 31 deletions

diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c
index beda387f2fc7..9bc2e3649157 100644
--- a/drivers/net/wan/farsync.c
+++ b/drivers/net/wan/farsync.c
@@ -1346,8 +1346,8 @@ do_bottom_half_tx(struct fst_card_info *card)
 
                 dev = port_to_dev(port);
                 while (!(FST_RDB(card, txDescrRing[pi][port->txpos].bits) &
-                         DMA_OWN)
-                       && !(card->dmatx_in_progress)) {
+                         DMA_OWN) &&
+                       !(card->dmatx_in_progress)) {
                         /*
                          * There doesn't seem to be a txdone event per-se
                          * We seem to have to deduce it, by checking the DMA_OWN
@@ -1379,8 +1379,8 @@ do_bottom_half_tx(struct fst_card_info *card)
                                  */
                                 FST_WRW(card, txDescrRing[pi][port->txpos].bcnt,
                                         cnv_bcnt(skb->len));
-                                if ((skb->len < FST_MIN_DMA_LEN)
-                                    || (card->family == FST_FAMILY_TXP)) {
+                                if ((skb->len < FST_MIN_DMA_LEN) ||
+                                    (card->family == FST_FAMILY_TXP)) {
                                         /* Enqueue the packet with normal io */
                                         memcpy_toio(card->mem +
                                                     BUF_OFFSET(txBuffer[pi]
@@ -2030,8 +2030,8 @@ fst_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                 /* Sanity check the parameters. We don't support partial writes
                  * when going over the top
                  */
-                if (wrthdr.size > FST_MEMSIZE || wrthdr.offset > FST_MEMSIZE
-                    || wrthdr.size + wrthdr.offset > FST_MEMSIZE) {
+                if (wrthdr.size > FST_MEMSIZE || wrthdr.offset > FST_MEMSIZE ||
+                    wrthdr.size + wrthdr.offset > FST_MEMSIZE) {
                         return -ENXIO;
                 }
 
diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c
index 79dabc557bd3..aec4d3955420 100644
--- a/drivers/net/wan/pc300_drv.c
+++ b/drivers/net/wan/pc300_drv.c
@@ -514,8 +514,8 @@ static int dma_buf_read(pc300_t * card, int ch, struct sk_buff *skb)
                                   RX_BD_ADDR(ch, chan->rx_first_bd));
         while ((status = cpc_readb(&ptdescr->status)) & DST_OSB) {
                 nchar = cpc_readw(&ptdescr->len);
-                if ((status & (DST_OVR | DST_CRC | DST_RBIT | DST_SHRT | DST_ABT))
-                    || (nchar > BD_DEF_LEN)) {
+                if ((status & (DST_OVR | DST_CRC | DST_RBIT | DST_SHRT | DST_ABT)) ||
+                    (nchar > BD_DEF_LEN)) {
 
                         if (nchar > BD_DEF_LEN)
                                 status |= DST_RBIT;
@@ -1428,8 +1428,7 @@ static void falc_update_stats(pc300_t * card, int ch)
 
                 if (((conf->media == IF_IFACE_T1) &&
                      (cpc_readb(falcbase + F_REG(FRS1, ch)) & FRS1_LLBAD) &&
-                     (!(cpc_readb(falcbase + F_REG(FRS1, ch)) & FRS1_PDEN)))
-                    ||
+                     (!(cpc_readb(falcbase + F_REG(FRS1, ch)) & FRS1_PDEN))) ||
                     ((conf->media == IF_IFACE_E1) &&
                      (cpc_readb(falcbase + F_REG(RSP, ch)) & RSP_LLBAD))) {
                         pfalc->prbs = 2;
@@ -2285,8 +2284,8 @@ static void falc_e1_intr(pc300_t * card, int ch)
                 if (gis & GIS_ISR1) {
                         isr1 = cpc_readb(falcbase + F_REG(FISR1, ch));
                         if (isr1 & FISR1_XMB) {
-                                if ((pfalc->xmb_cause & 2)
-                                    && pfalc->multiframe_mode) {
+                                if ((pfalc->xmb_cause & 2) &&
+                                    pfalc->multiframe_mode) {
                                         if (cpc_readb (falcbase + F_REG(FRS0, ch)) & 
                                                                         (FRS0_LOS | FRS0_AIS | FRS0_LFA)) {
                                                 cpc_writeb(falcbase + F_REG(XSP, ch),
@@ -2639,9 +2638,9 @@ static int cpc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                                                 !(cpc_readb (scabase + M_REG(CTL, ch)) & CTL_DTR);
                                         /* There is no DSR in HD64572 */
                                 }
-                                if (!arg
-                                    || copy_to_user(arg, &pc300status, sizeof(pc300status_t)))
-                                                return -EINVAL;
+                                if (!arg ||
+                                    copy_to_user(arg, &pc300status, sizeof(pc300status_t)))
+                                        return -EINVAL;
                                 return 0;
                         }
 
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c
index 1cc24a45f003..25477b5cde47 100644
--- a/drivers/net/wan/sbni.c
+++ b/drivers/net/wan/sbni.c
@@ -195,9 +195,9 @@ static unsigned int  netcard_portlist[ ] __initdata = {
 static inline int __init
 sbni_isa_probe( struct net_device  *dev )
 {
-        if( dev->base_addr > 0x1ff
-            &&  request_region( dev->base_addr, SBNI_IO_EXTENT, dev->name )
-            &&  sbni_probe1( dev, dev->base_addr, dev->irq ) )
+        if( dev->base_addr > 0x1ff &&
+            request_region( dev->base_addr, SBNI_IO_EXTENT, dev->name ) &&
+            sbni_probe1( dev, dev->base_addr, dev->irq ) )
 
                 return  0;
         else {
@@ -286,8 +286,8 @@ static int __init sbni_init(struct net_device *dev)
 
         for( i = 0;  netcard_portlist[ i ];  ++i ) {
                 int  ioaddr = netcard_portlist[ i ];
-                if( request_region( ioaddr, SBNI_IO_EXTENT, dev->name )
-                    &&  sbni_probe1( dev, ioaddr, 0 ))
+                if( request_region( ioaddr, SBNI_IO_EXTENT, dev->name ) &&
+                    sbni_probe1( dev, ioaddr, 0 ))
                         return 0;
         }
 
@@ -306,9 +306,9 @@ sbni_pci_probe( struct net_device  *dev )
                 unsigned long  pci_ioaddr;
                 u16  subsys;
 
-                if( pdev->vendor != SBNI_PCI_VENDOR
-                    &&  pdev->device != SBNI_PCI_DEVICE )
-                                continue;
+                if( pdev->vendor != SBNI_PCI_VENDOR &&
+                    pdev->device != SBNI_PCI_DEVICE )
+                        continue;
 
                 pci_ioaddr = pci_resource_start( pdev, 0 );
                 pci_irq_line = pdev->irq;
@@ -977,8 +977,8 @@ check_fhdr( u32  ioaddr,  u32  *framelen,  u32  *frameno,  u32  *ack,
         *ack = *framelen & FRAME_ACK_MASK;
         *is_first = (*framelen & FRAME_FIRST) != 0;
 
-        if( (*framelen &= FRAME_LEN_MASK) < 6
-            ||  *framelen > SBNI_MAX_FRAME - 3 )
+        if( (*framelen &= FRAME_LEN_MASK) < 6 ||
+            *framelen > SBNI_MAX_FRAME - 3 )
                 return  0;
 
         value = inb( ioaddr + DAT );
@@ -1173,10 +1173,10 @@ sbni_open( struct net_device  *dev )
         if( dev->base_addr < 0x400 ) {          /* ISA only */
                 struct net_device  **p = sbni_cards;
                 for( ;  *p  &&  p < sbni_cards + SBNI_MAX_NUM_CARDS;  ++p )
-                        if( (*p)->irq == dev->irq
-                            &&  ((*p)->base_addr == dev->base_addr + 4
-                                 ||  (*p)->base_addr == dev->base_addr - 4)
-                            &&  (*p)->flags & IFF_UP ) {
+                        if( (*p)->irq == dev->irq &&
+                            ((*p)->base_addr == dev->base_addr + 4 ||
+                             (*p)->base_addr == dev->base_addr - 4) &&
+                            (*p)->flags & IFF_UP ) {
 
                                 ((struct net_local *) (netdev_priv(*p)))
                                         ->second = dev;
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c
index 3c325d77939b..b9f520b7db6a 100644
--- a/drivers/net/wan/x25_asy.c
+++ b/drivers/net/wan/x25_asy.c
@@ -657,8 +657,8 @@ static void x25_asy_unesc(struct x25_asy *sl, unsigned char s)
 
         switch (s) {
         case X25_END:
-                if (!test_and_clear_bit(SLF_ERROR, &sl->flags)
-                        && sl->rcount > 2)
+                if (!test_and_clear_bit(SLF_ERROR, &sl->flags) &&
+                    sl->rcount > 2)
                         x25_asy_bump(sl);
                 clear_bit(SLF_ESCAPE, &sl->flags);
                 sl->rcount = 0;