From: Guangbin Huang <huangguangbin2@huawei.com>
To: <davem@davemloft.net>, <kuba@kernel.org>, <xie.he.0141@gmail.com>,
<ms@dev.tdt.de>, <willemb@google.com>
Cc: <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<lipeng321@huawei.com>, <huangguangbin2@huawei.com>
Subject: [PATCH V2 net-next 07/11] net: z85230: fix the code style issue about "if..else.."
Date: Mon, 14 Jun 2021 19:28:47 +0800 [thread overview]
Message-ID: <1623670131-49973-8-git-send-email-huangguangbin2@huawei.com> (raw)
In-Reply-To: <1623670131-49973-1-git-send-email-huangguangbin2@huawei.com>
From: Peng Li <lipeng321@huawei.com>
According to the chackpatch.pl, else should follow close brace '}',
braces {} should be used on all arms of this statement.
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
---
drivers/net/wan/z85230.c | 24 ++++++++----------------
1 file changed, 8 insertions(+), 16 deletions(-)
diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
index a3a2051..556de05 100644
--- a/drivers/net/wan/z85230.c
+++ b/drivers/net/wan/z85230.c
@@ -354,9 +354,7 @@ static void z8530_rx(struct z8530_channel *c)
/* printk("crc error\n"); */
}
/* Shove the frame upstream */
- }
- else
- {
+ } else {
/* Drop the lock for RX processing, or
* there are deadlocks
*/
@@ -489,9 +487,7 @@ static void z8530_dma_rx(struct z8530_channel *chan)
}
write_zsctrl(chan, ERR_RES);
write_zsctrl(chan, RES_H_IUS);
- }
- else
- {
+ } else {
/* DMA is off right now, drain the slow way */
z8530_rx(chan);
}
@@ -1379,9 +1375,7 @@ static void z8530_tx_begin(struct z8530_channel *c)
release_dma_lock(flags);
}
c->txcount=0;
- }
- else
- {
+ } else {
c->txcount=c->tx_skb->len;
if(c->dma_tx)
@@ -1412,9 +1406,7 @@ static void z8530_tx_begin(struct z8530_channel *c)
release_dma_lock(flags);
write_zsctrl(c, RES_EOM_L);
write_zsreg(c, R5, c->regs[R5]|TxENAB);
- }
- else
- {
+ } else {
/* ABUNDER off */
write_zsreg(c, R10, c->regs[10]);
write_zsctrl(c, RES_Tx_CRC);
@@ -1530,12 +1522,12 @@ static void z8530_rx_done(struct z8530_channel *c)
* from passing
*/
write_zsreg(c, R0, RES_Rx_CRC);
- }
- else
+ } else {
/* Can't occur as we dont reenable the DMA irq until
* after the flip is done
*/
netdev_warn(c->netdevice, "DMA flip overrun!\n");
+ }
release_dma_lock(flags);
@@ -1661,9 +1653,9 @@ netdev_tx_t z8530_queue_xmit(struct z8530_channel *c, struct sk_buff *skb)
c->tx_next_ptr=c->tx_dma_buf[c->tx_dma_used];
c->tx_dma_used^=1; /* Flip temp buffer */
skb_copy_from_linear_data(skb, c->tx_next_ptr, skb->len);
+ } else {
+ c->tx_next_ptr = skb->data;
}
- else
- c->tx_next_ptr=skb->data;
RT_LOCK;
c->tx_next_skb=skb;
RT_UNLOCK;
--
2.8.1
next prev parent reply other threads:[~2021-06-14 11:40 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-14 11:28 [PATCH V2 net-next 00/11] net: z85230: clean up some code style issues Guangbin Huang
2021-06-14 11:28 ` [PATCH V2 net-next 01/11] net: z85230: remove redundant blank lines Guangbin Huang
2021-06-14 11:28 ` [PATCH V2 net-next 02/11] net: z85230: add blank line after declarations Guangbin Huang
2021-06-14 11:28 ` [PATCH V2 net-next 03/11] net: z85230: fix the code style issue about EXPORT_SYMBOL(foo) Guangbin Huang
2021-06-14 11:28 ` [PATCH V2 net-next 04/11] net: z85230: remove redundant initialization for statics Guangbin Huang
2021-06-14 11:28 ` [PATCH V2 net-next 05/11] net: z85230: replace comparison to NULL with "!skb" Guangbin Huang
2021-06-14 11:28 ` [PATCH V2 net-next 06/11] net: z85230: fix the comments style issue Guangbin Huang
2021-06-14 11:28 ` Guangbin Huang [this message]
2021-06-14 11:28 ` [PATCH V2 net-next 08/11] net: z85230: remove trailing whitespaces Guangbin Huang
2021-06-14 11:28 ` [PATCH V2 net-next 09/11] net: z85230: add some required spaces Guangbin Huang
2021-06-14 11:28 ` [PATCH V2 net-next 10/11] net: z85230: fix the code style issue about open brace { Guangbin Huang
2021-06-14 11:28 ` [PATCH V2 net-next 11/11] net: z85230: remove unnecessary out of memory message Guangbin Huang
2021-06-14 13:04 ` [PATCH V2 net-next 00/11] net: z85230: clean up some code style issues huangguangbin (A)
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=1623670131-49973-8-git-send-email-huangguangbin2@huawei.com \
--to=huangguangbin2@huawei.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lipeng321@huawei.com \
--cc=ms@dev.tdt.de \
--cc=netdev@vger.kernel.org \
--cc=willemb@google.com \
--cc=xie.he.0141@gmail.com \
/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).