Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e95a202 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

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: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3454f835

drivers/net/3c501.c

+4 −4
Original line number Diff line number Diff line
@@ -249,11 +249,11 @@ static int __init el1_probe1(struct net_device *dev, int ioaddr) 
	 *	for the Sager NP943 prefix.

	 */



	if (station_addr[0] == 0x02  &&  station_addr[1] == 0x60

						&& station_addr[2] == 0x8c)

	if (station_addr[0] == 0x02 && station_addr[1] == 0x60 &&

	    station_addr[2] == 0x8c)

		mname = "3c501";

	else if (station_addr[0] == 0x00  &&  station_addr[1] == 0x80

						&& station_addr[2] == 0xC8)

	else if (station_addr[0] == 0x00 && station_addr[1] == 0x80 &&

		 station_addr[2] == 0xC8)

		mname = "NP943";

	else {

		release_region(ioaddr, EL1_IO_EXTENT);

drivers/net/3c503.c

+8 −7
Original line number Diff line number Diff line
@@ -214,8 +214,8 @@ el2_probe1(struct net_device *dev, int ioaddr) 
    iobase_reg = inb(ioaddr+0x403);

    membase_reg = inb(ioaddr+0x404);

    /* ASIC location registers should be 0 or have only a single bit set. */

    if (   (iobase_reg  & (iobase_reg - 1))

	|| (membase_reg & (membase_reg - 1))) {

    if ((iobase_reg  & (iobase_reg - 1)) ||

	(membase_reg & (membase_reg - 1))) {

	retval = -ENODEV;

	goto out1;

    }
@@ -291,8 +291,8 @@ el2_probe1(struct net_device *dev, int ioaddr) 
	    writel(0xba5eba5e, mem_base);

	    for (i = sizeof(test_val); i < EL2_MEMSIZE; i+=sizeof(test_val)) {

		writel(test_val, mem_base + i);

		if (readl(mem_base) != 0xba5eba5e

		    || readl(mem_base + i) != test_val) {

		if (readl(mem_base) != 0xba5eba5e ||

		    readl(mem_base + i) != test_val) {

		    pr_warning("3c503: memory failure or memory address conflict.\n");

		    dev->mem_start = 0;

		    ei_status.name = "3c503-PIO";
@@ -397,9 +397,10 @@ el2_open(struct net_device *dev) 
		unsigned long cookie = probe_irq_on();

		outb_p(0x04 << ((*irqp == 9) ? 2 : *irqp), E33G_IDCFR);

		outb_p(0x00, E33G_IDCFR);

		if (*irqp == probe_irq_off(cookie)	/* It's a good IRQ line! */

		    && ((retval = request_irq(dev->irq = *irqp,

		    eip_interrupt, 0, dev->name, dev)) == 0))

		if (*irqp == probe_irq_off(cookie) &&	/* It's a good IRQ line! */

		    ((retval = request_irq(dev->irq = *irqp,

					   eip_interrupt, 0,

					   dev->name, dev)) == 0))

		    break;

	    } else {

		    if (retval != -EBUSY)

drivers/net/3c507.c

+2 −2
Original line number Diff line number Diff line
@@ -836,8 +836,8 @@ static void el16_rx(struct net_device *dev) 
		void __iomem *data_frame = lp->base + data_buffer_addr;

		ushort pkt_len = readw(data_frame);



		if (rfd_cmd != 0 || data_buffer_addr != rx_head + 22

			|| (pkt_len & 0xC000) != 0xC000) {

		if (rfd_cmd != 0 || data_buffer_addr != rx_head + 22 ||

		    (pkt_len & 0xC000) != 0xC000) {

			pr_err("%s: Rx frame at %#x corrupted, "

			       "status %04x cmd %04x next %04x "

			       "data-buf @%04x %04x.\n",

drivers/net/3c509.c

+5 −5
Original line number Diff line number Diff line
@@ -253,8 +253,8 @@ static int el3_isa_id_sequence(__be16 *phys_addr) 
		   This check is needed in order not to register them twice. */

		for (i = 0; i < el3_cards; i++) {

			struct el3_private *lp = netdev_priv(el3_devs[i]);

			if (lp->type == EL3_PNP

			    && !memcmp(phys_addr, el3_devs[i]->dev_addr,

			if (lp->type == EL3_PNP &&

			    !memcmp(phys_addr, el3_devs[i]->dev_addr,

				    ETH_ALEN)) {

				if (el3_debug > 3)

					pr_debug("3c509 with address %02x %02x %02x %02x %02x %02x was found by ISAPnP\n",
@@ -835,8 +835,8 @@ el3_start_xmit(struct sk_buff *skb, struct net_device *dev) 
#ifndef final_version

	{	/* Error-checking code, delete someday. */

		ushort status = inw(ioaddr + EL3_STATUS);

		if (status & 0x0001 		/* IRQ line active, missed one. */

			&& inw(ioaddr + EL3_STATUS) & 1) { 			/* Make sure. */

		if (status & 0x0001 && 		/* IRQ line active, missed one. */

		    inw(ioaddr + EL3_STATUS) & 1) { 			/* Make sure. */

			pr_debug("%s: Missed interrupt, status then %04x now %04x"

				   "  Tx %2.2x Rx %4.4x.\n", dev->name, status,

				   inw(ioaddr + EL3_STATUS), inb(ioaddr + TX_STATUS),

drivers/net/3c515.c

+7 −6
Original line number Diff line number Diff line
@@ -764,10 +764,11 @@ static int corkscrew_open(struct net_device *dev) 
	/* Use the now-standard shared IRQ implementation. */

	if (vp->capabilities == 0x11c7) {

		/* Corkscrew: Cannot share ISA resources. */

		if (dev->irq == 0

		    || dev->dma == 0

		    || request_irq(dev->irq, corkscrew_interrupt, 0,

				   vp->product_name, dev)) return -EAGAIN;

		if (dev->irq == 0 ||

		    dev->dma == 0 ||

		    request_irq(dev->irq, corkscrew_interrupt, 0,

				vp->product_name, dev))

			return -EAGAIN;

		enable_dma(dev->dma);

		set_dma_mode(dev->dma, DMA_MODE_CASCADE);

	} else if (request_irq(dev->irq, corkscrew_interrupt, IRQF_SHARED,
@@ -1368,8 +1369,8 @@ static int boomerang_rx(struct net_device *dev) 


			/* Check if the packet is long enough to just accept without

			   copying to a properly sized skbuff. */

			if (pkt_len < rx_copybreak

			    && (skb = dev_alloc_skb(pkt_len + 4)) != NULL) {

			if (pkt_len < rx_copybreak &&

			    (skb = dev_alloc_skb(pkt_len + 4)) != NULL) {

				skb_reserve(skb, 2);	/* Align IP on 16 byte boundaries */

				/* 'skb_put()' points to the start of sk_buff data area. */

				memcpy(skb_put(skb, pkt_len),