From: Joe Perches <joe@perches.com>
To: Jiri Kosina <trivial@kernel.org>, linux-kernel@vger.kernel.org
Cc: "David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
netdev@vger.kernel.org
Subject: [PATCH 16/29] 8390: Avoid comma separated statements
Date: Mon, 24 Aug 2020 21:56:13 -0700 [thread overview]
Message-ID: <720727617483779e9831f513bf9b671f59d26d57.1598331149.git.joe@perches.com> (raw)
In-Reply-To: <cover.1598331148.git.joe@perches.com>
Use semicolons and braces.
Signed-off-by: Joe Perches <joe@perches.com>
---
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
next prev parent reply other threads:[~2020-08-25 4:58 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-25 4:55 [PATCH 00/29] treewide: Convert comma separated statements Joe Perches
2020-08-25 4:55 ` [PATCH 01/29] coding-style.rst: Avoid comma statements Joe Perches
2021-01-30 18:53 ` Joe Perches
2021-02-04 21:41 ` Jonathan Corbet
2020-08-25 4:55 ` [PATCH 02/29] alpha: Avoid comma separated statements Joe Perches
2020-08-25 6:37 ` Robert Richter
2021-01-30 18:54 ` Joe Perches
2021-02-16 14:39 ` Robert Richter
2021-02-16 15:10 ` Joe Perches
2020-08-25 4:56 ` [PATCH 03/29] ia64: " Joe Perches
2021-01-30 18:55 ` Joe Perches
2020-08-25 4:56 ` [PATCH 04/29] sparc: " Joe Perches
2021-01-30 18:56 ` Joe Perches
2020-08-25 4:56 ` [PATCH 05/29] ata: " Joe Perches
2021-01-30 18:56 ` Joe Perches
2021-01-31 15:06 ` Jens Axboe
2020-08-25 4:56 ` [PATCH 06/29] drbd: " Joe Perches
2021-01-30 18:57 ` Joe Perches
2021-01-31 15:06 ` Jens Axboe
2020-08-25 4:56 ` [PATCH 07/29] lp: " Joe Perches
2020-08-25 4:56 ` [PATCH 08/29] dma-buf: " Joe Perches
2020-08-26 15:08 ` Christian König
2020-09-03 12:21 ` Sumit Semwal
2020-09-04 11:42 ` Kieran Bingham
2020-09-04 21:33 ` Joe Perches
2021-01-30 18:47 ` Joe Perches
2021-02-03 13:26 ` Christian König
2021-01-31 17:39 ` Joe Perches
2021-01-31 17:53 ` Christian König
2021-02-01 21:54 ` Lyude Paul
2021-02-02 8:33 ` [Linaro-mm-sig] " Christian König
2021-02-02 18:24 ` Lyude Paul
2020-08-25 4:56 ` [PATCH 09/29] drm/gma500: " Joe Perches
2021-01-30 18:47 ` Joe Perches
2021-01-30 21:21 ` Patrik Jakobsson
2020-08-25 4:56 ` [PATCH 10/29] drm/i915: " Joe Perches
2021-01-30 18:47 ` Joe Perches
2021-02-01 8:41 ` Jani Nikula
2020-08-25 4:56 ` [PATCH 11/29] hwmon: (scmi-hwmon): " Joe Perches
2020-08-25 23:33 ` Guenter Roeck
2020-08-25 4:56 ` [PATCH 12/29] Input: MT - " Joe Perches
2020-08-25 17:07 ` Dmitry Torokhov
2020-08-25 4:56 ` [PATCH 13/29] bcache: " Joe Perches
2021-01-30 18:59 ` Joe Perches
2021-01-31 15:58 ` Coly Li
2020-08-25 4:56 ` [PATCH 14/29] media: " Joe Perches
2020-09-04 11:45 ` Kieran Bingham
2020-08-25 4:56 ` [PATCH 15/29] mtd: " Joe Perches
2020-09-07 7:34 ` Miquel Raynal
2020-08-25 4:56 ` Joe Perches [this message]
2020-08-25 14:54 ` [PATCH 16/29] 8390: " David Miller
2020-08-25 4:56 ` [PATCH 17/29] fs_enet: " Joe Perches
2020-08-25 14:55 ` David Miller
2020-08-25 4:56 ` [PATCH 18/29] wan: sbni: " Joe Perches
2020-08-25 14:55 ` David Miller
2020-08-25 4:56 ` [PATCH 19/29] s390/tty3270: " Joe Perches
2021-01-30 19:01 ` Joe Perches
2020-08-25 4:56 ` [PATCH 20/29] scai/arm: " Joe Perches
2020-08-25 4:56 ` [PATCH 21/29] media: atomisp: " Joe Perches
2020-09-04 11:46 ` Kieran Bingham
2020-08-25 4:56 ` [PATCH 22/29] video: fbdev: " Joe Perches
2020-09-08 11:37 ` Bartlomiej Zolnierkiewicz
2020-08-25 4:56 ` [PATCH 23/29] fuse: " Joe Perches
2021-01-30 19:04 ` Joe Perches
2021-02-01 8:12 ` Miklos Szeredi
2020-08-25 4:56 ` [PATCH 24/29] reiserfs: " Joe Perches
2021-01-30 19:04 ` Joe Perches
2020-08-25 4:56 ` [PATCH 25/29] lib/zlib: " Joe Perches
2021-01-30 19:05 ` Joe Perches
2020-08-25 4:56 ` [PATCH 26/29] lib: zstd: " Joe Perches
2021-01-30 19:06 ` Joe Perches
2020-08-25 4:56 ` [PATCH 27/29] ipv6: fib6: " Joe Perches
2020-08-25 14:55 ` David Miller
2020-08-25 4:56 ` [PATCH 28/29] sunrpc: " Joe Perches
2020-08-25 14:55 ` David Miller
2020-08-25 4:56 ` [PATCH 29/29] tools: " Joe Perches
2020-08-26 9:30 ` Thomas Renninger
2020-08-26 14:45 ` Joe Perches
2020-08-26 16:13 ` Thomas Renninger
2020-09-09 2:09 ` [PATCH 00/29] treewide: Convert " Martin K. Petersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=720727617483779e9831f513bf9b671f59d26d57.1598331149.git.joe@perches.com \
--to=joe@perches.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=trivial@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).