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>

1 files changed, 14 insertions, 14 deletions

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;