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

8390: Avoid comma separated statements 



Use semicolons and braces.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 343d8c60

drivers/net/ethernet/8390/axnet_cs.c

+11 −6
Original line number Diff line number Diff line
@@ -657,8 +657,10 @@ static void block_input(struct net_device *dev, int count, 
    outb_p(E8390_RREAD+E8390_START, nic_base + AXNET_CMD);



    insw(nic_base + AXNET_DATAPORT,buf,count>>1);

    if (count & 0x01)

	buf[count-1] = inb(nic_base + AXNET_DATAPORT), xfer_count++;

    if (count & 0x01) {

	buf[count-1] = inb(nic_base + AXNET_DATAPORT);

	xfer_count++;

    }



}
@@ -1270,10 +1272,12 @@ static void ei_tx_intr(struct net_device *dev) 
			ei_local->txing = 1;

			NS8390_trigger_send(dev, ei_local->tx2, ei_local->tx_start_page + 6);

			netif_trans_update(dev);

			ei_local->tx2 = -1,

			ei_local->tx2 = -1;

			ei_local->lasttx = 2;

		} else {

			ei_local->lasttx = 20;

			ei_local->txing = 0;

		}

		else ei_local->lasttx = 20, ei_local->txing = 0;	

	}

	else if (ei_local->tx2 < 0) 

	{
@@ -1289,9 +1293,10 @@ static void ei_tx_intr(struct net_device *dev) 
			netif_trans_update(dev);

			ei_local->tx1 = -1;

			ei_local->lasttx = 1;

		} else {

			ei_local->lasttx = 10;

			ei_local->txing = 0;

		}

		else

			ei_local->lasttx = 10, ei_local->txing = 0;

	}

//	else

//		netdev_warn(dev, "unexpected TX-done interrupt, lasttx=%d\n",

drivers/net/ethernet/8390/lib8390.c

+9 −5
Original line number Diff line number Diff line
@@ -597,10 +597,12 @@ static void ei_tx_intr(struct net_device *dev) 
			ei_local->txing = 1;

			NS8390_trigger_send(dev, ei_local->tx2, ei_local->tx_start_page + 6);

			netif_trans_update(dev);

			ei_local->tx2 = -1,

			ei_local->tx2 = -1;

			ei_local->lasttx = 2;

		} else

			ei_local->lasttx = 20, ei_local->txing = 0;

		} else {

			ei_local->lasttx = 20;

			ei_local->txing = 0;

		}

	} else if (ei_local->tx2 < 0) {

		if (ei_local->lasttx != 2  &&  ei_local->lasttx != -2)

			pr_err("%s: bogus last_tx_buffer %d, tx2=%d\n",
@@ -612,8 +614,10 @@ static void ei_tx_intr(struct net_device *dev) 
			netif_trans_update(dev);

			ei_local->tx1 = -1;

			ei_local->lasttx = 1;

		} else

			ei_local->lasttx = 10, ei_local->txing = 0;

		} else {

			ei_local->lasttx = 10;

			ei_local->txing = 0;

		}

	} /* else

		netdev_warn(dev, "unexpected TX-done interrupt, lasttx=%d\n",

			    ei_local->lasttx);

drivers/net/ethernet/8390/pcnet_cs.c

+4 −2
Original line number Diff line number Diff line
@@ -1178,8 +1178,10 @@ static void dma_block_input(struct net_device *dev, int count, 
    outb_p(E8390_RREAD+E8390_START, nic_base + PCNET_CMD);



    insw(nic_base + PCNET_DATAPORT,buf,count>>1);

    if (count & 0x01)

	buf[count-1] = inb(nic_base + PCNET_DATAPORT), xfer_count++;

    if (count & 0x01) {

	buf[count-1] = inb(nic_base + PCNET_DATAPORT);

	xfer_count++;

    }



    /* This was for the ALPHA version only, but enough people have been

       encountering problems that it is still here. */