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>

5 files changed, 26 insertions, 26 deletions

diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index 3131a59a8d32..ca711f46814e 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -1232,8 +1232,8 @@ static irqreturn_t ax_interrupt(int irq, void *dev_id)
         ei_local->irqlock = 1;
    
         /* !!Assumption!! -- we stay in page 0.  Don't break this. */
-        while ((interrupts = inb_p(e8390_base + EN0_ISR)) != 0
-                   && ++nr_serviced < MAX_SERVICE) 
+        while ((interrupts = inb_p(e8390_base + EN0_ISR)) != 0 &&
+               ++nr_serviced < MAX_SERVICE)
         {
                 if (!netif_running(dev) || (interrupts == 0xff)) {
                         if (ei_debug > 1)
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
index 57e09616330a..a6961215cd56 100644
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/pcmcia/fmvj18x_cs.c
@@ -371,9 +371,9 @@ static int fmvj18x_config(struct pcmcia_device *link)
         switch (link->manf_id) {
         case MANFID_TDK:
             cardtype = TDK;
-            if (link->card_id == PRODID_TDK_GN3410
-                        || link->card_id == PRODID_TDK_NP9610
-                        || link->card_id == PRODID_TDK_MN3200) {
+            if (link->card_id == PRODID_TDK_GN3410 ||
+                link->card_id == PRODID_TDK_NP9610 ||
+                link->card_id == PRODID_TDK_MN3200) {
                 /* MultiFunction Card */
                 link->conf.ConfigBase = 0x800;
                 link->conf.ConfigIndex = 0x47;
@@ -590,11 +590,11 @@ static int fmvj18x_get_hwinfo(struct pcmcia_device *link, u_char *node_id)
     */ 
     for (i = 0; i < 0x200; i++) {
         if (readb(base+i*2) == 0x22) {  
-            if (readb(base+(i-1)*2) == 0xff
-             && readb(base+(i+5)*2) == 0x04
-             && readb(base+(i+6)*2) == 0x06
-             && readb(base+(i+13)*2) == 0xff) 
-                break;
+                if (readb(base+(i-1)*2) == 0xff &&
+                    readb(base+(i+5)*2) == 0x04 &&
+                    readb(base+(i+6)*2) == 0x06 &&
+                    readb(base+(i+13)*2) == 0xff)
+                        break;
         }
     }
 
@@ -1219,8 +1219,8 @@ static void set_rx_mode(struct net_device *dev)
     if (dev->flags & IFF_PROMISC) {
         memset(mc_filter, 0xff, sizeof(mc_filter));
         outb(3, ioaddr + RX_MODE);      /* Enable promiscuous mode */
-    } else if (dev->mc_count > MC_FILTERBREAK
-               ||  (dev->flags & IFF_ALLMULTI)) {
+    } else if (dev->mc_count > MC_FILTERBREAK ||
+               (dev->flags & IFF_ALLMULTI)) {
         /* Too many to filter perfectly -- accept all multicasts. */
         memset(mc_filter, 0xff, sizeof(mc_filter));
         outb(2, ioaddr + RX_MODE);      /* Use normal mode. */
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index 469684474b72..347eaee855c0 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -601,8 +601,8 @@ static int pcnet_config(struct pcmcia_device *link)
         dev->if_port = 0;
     }
 
-    if ((link->conf.ConfigBase == 0x03c0)
-        && (link->manf_id == 0x149) && (link->card_id == 0xc1ab)) {
+    if ((link->conf.ConfigBase == 0x03c0) &&
+        (link->manf_id == 0x149) && (link->card_id == 0xc1ab)) {
         printk(KERN_INFO "pcnet_cs: this is an AX88190 card!\n");
         printk(KERN_INFO "pcnet_cs: use axnet_cs instead.\n");
         goto failed;
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index 7bde2cd34c7e..117b083a10cb 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -526,10 +526,10 @@ static int mhz_mfc_config(struct pcmcia_device *link)
         mem.CardOffset = link->conf.ConfigBase;
     i = pcmcia_map_mem_page(link->win, &mem);
 
-    if ((i == 0)
-        && (smc->manfid == MANFID_MEGAHERTZ)
-        && (smc->cardid == PRODID_MEGAHERTZ_EM3288))
-        mhz_3288_power(link);
+    if ((i == 0) &&
+        (smc->manfid == MANFID_MEGAHERTZ) &&
+        (smc->cardid == PRODID_MEGAHERTZ_EM3288))
+            mhz_3288_power(link);
 
 free_cfg_mem:
     kfree(cfg_mem);
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
index cf8423102538..187da21f720b 100644
--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
@@ -421,9 +421,9 @@ PrintRegisters(struct net_device *dev)
             printk("\n");
         }
         for (page=0x40 ; page <= 0x5f; page++) {
-            if (page == 0x43 || (page >= 0x46 && page <= 0x4f)
-                || (page >= 0x51 && page <=0x5e))
-                continue;
+                if (page == 0x43 || (page >= 0x46 && page <= 0x4f) ||
+                    (page >= 0x51 && page <=0x5e))
+                        continue;
             printk(KDBG_XIRC "Register page %2x: ", page);
             SelectPage(page);
             for (i = 8; i < 16; i++)
@@ -834,9 +834,9 @@ xirc2ps_config(struct pcmcia_device * link)
         /* Once I saw two CISTPL_FUNCE_LAN_NODE_ID entries:
          * the first one with a length of zero the second correct -
          * so I skip all entries with length 0 */
-        if (parse.funce.type == CISTPL_FUNCE_LAN_NODE_ID
-            && ((cistpl_lan_node_id_t *)parse.funce.data)->nb)
-            break;
+            if (parse.funce.type == CISTPL_FUNCE_LAN_NODE_ID &&
+                ((cistpl_lan_node_id_t *)parse.funce.data)->nb)
+                    break;
     }
     if (err) { /* not found: try to get the node-id from tuple 0x89 */
         tuple.DesiredTuple = 0x89;  /* data layout looks like tuple 0x22 */
@@ -852,8 +852,8 @@ xirc2ps_config(struct pcmcia_device * link)
         tuple.DesiredTuple = CISTPL_FUNCE;
         for (err = first_tuple(link, &tuple, &parse); !err;
                                  err = next_tuple(link, &tuple, &parse)) {
-            if (parse.funce.type == 0x02 && parse.funce.data[0] == 1
-                && parse.funce.data[1] == 6 && tuple.TupleDataLen == 13) {
+                if (parse.funce.type == 0x02 && parse.funce.data[0] == 1 &&
+                    parse.funce.data[1] == 6 && tuple.TupleDataLen == 13) {
                 buf[1] = 4;
                 memcpy(&parse, buf+1, 8);
                 break;