Re: [PATCH 16/29] 8390: Avoid comma separated statements

[David Miller]

From: Joe Perches 
Date: Mon, 24 Aug 2020 21:56:13 -0700

> Use semicolons and braces.
> 
> Signed-off-by: Joe Perches 

Applied.

[PATCH 16/29] 8390: Avoid comma separated statements

[Joe Perches]

Use semicolons and braces.

Signed-off-by: Joe Perches 
---
 drivers/net/ethernet/8390/axnet_cs.c | 19 ---
 drivers/net/ethernet/8390/lib8390.c  | 14 +-
 drivers/net/ethernet/8390/pcnet_cs.c |  6 --
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/drivers/net/ethernet/8390/axnet_cs.c 
b/drivers/net/ethernet/8390/axnet_cs.c
index a00b36f91d9f..d041b6dda012 100644
--- a/drivers/net/ethernet/8390/axnet_cs.c
+++ b/drivers/net/ethernet/8390/axnet_cs.c
@@ -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",
diff --git a/drivers/net/ethernet/8390/lib8390.c 
b/drivers/net/ethernet/8390/lib8390.c
index babc92e2692e..1f48d7f6365c 100644
--- a/drivers/net/ethernet/8390/lib8390.c
+++ b/drivers/net/ethernet/8390/lib8390.c
@@ -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);
diff --git a/drivers/net/ethernet/8390/pcnet_cs.c 
b/drivers/net/ethernet/8390/pcnet_cs.c
index 164c3ed550bf..9d3b1e0e425c 100644
--- a/drivers/net/ethernet/8390/pcnet_cs.c
+++ b/drivers/net/ethernet/8390/pcnet_cs.c
@@ -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. */
-- 
2.26.0