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, 10 insertions, 10 deletions

diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
index 076f23a10517..dcc67a35e8f2 100644
--- a/drivers/net/pcnet32.c
+++ b/drivers/net/pcnet32.c
@@ -1515,8 +1515,8 @@ static void __devinit pcnet32_probe_vlbus(unsigned int *pcnet32_portlist)
                 if (request_region
                     (ioaddr, PCNET32_TOTAL_SIZE, "pcnet32_probe_vlbus")) {
                         /* check if there is really a pcnet chip on that ioaddr */
-                        if ((inb(ioaddr + 14) == 0x57)
-                            && (inb(ioaddr + 15) == 0x57)) {
+                        if ((inb(ioaddr + 14) == 0x57) &&
+                            (inb(ioaddr + 15) == 0x57)) {
                                 pcnet32_probe1(ioaddr, 0, NULL);
                         } else {
                                 release_region(ioaddr, PCNET32_TOTAL_SIZE);
@@ -1610,8 +1610,8 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
                 a = &pcnet32_wio;
         } else {
                 pcnet32_dwio_reset(ioaddr);
-                if (pcnet32_dwio_read_csr(ioaddr, 0) == 4
-                    && pcnet32_dwio_check(ioaddr)) {
+                if (pcnet32_dwio_read_csr(ioaddr, 0) == 4 &&
+                    pcnet32_dwio_check(ioaddr)) {
                         a = &pcnet32_dwio;
                 } else {
                         if (pcnet32_debug & NETIF_MSG_PROBE)
@@ -1750,8 +1750,8 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
         for (i = 0; i < 6; i++)
                 promaddr[i] = inb(ioaddr + i);
 
-        if (memcmp(promaddr, dev->dev_addr, 6)
-            || !is_valid_ether_addr(dev->dev_addr)) {
+        if (memcmp(promaddr, dev->dev_addr, 6) ||
+            !is_valid_ether_addr(dev->dev_addr)) {
                 if (is_valid_ether_addr(promaddr)) {
                         if (pcnet32_debug & NETIF_MSG_PROBE) {
                                 printk(" warning: CSR address invalid,\n");
@@ -1840,8 +1840,8 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
         lp->mii = mii;
         lp->chip_version = chip_version;
         lp->msg_enable = pcnet32_debug;
-        if ((cards_found >= MAX_UNITS)
-            || (options[cards_found] >= sizeof(options_mapping)))
+        if ((cards_found >= MAX_UNITS) ||
+            (options[cards_found] >= sizeof(options_mapping)))
                 lp->options = PCNET32_PORT_ASEL;
         else
                 lp->options = options_mapping[options[cards_found]];
@@ -1866,8 +1866,8 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
                 goto err_free_ring;
         }
         /* detect special T1/E1 WAN card by checking for MAC address */
-        if (dev->dev_addr[0] == 0x00 && dev->dev_addr[1] == 0xe0
-            && dev->dev_addr[2] == 0x75)
+        if (dev->dev_addr[0] == 0x00 && dev->dev_addr[1] == 0xe0 &&
+            dev->dev_addr[2] == 0x75)
                 lp->options = PCNET32_PORT_FD | PCNET32_PORT_GPSI;
 
         lp->init_block->mode = cpu_to_le16(0x0003);     /* Disable Rx and Tx. */