From: Guangbin Huang <huangguangbin2@huawei.com>
To: <wg@grandegger.com>, <mkl@pengutronix.de>, <davem@davemloft.net>,
<kuba@kernel.org>
Cc: <linux-can@vger.kernel.org>, <netdev@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <lipeng321@huawei.com>,
<huangguangbin2@huawei.com>
Subject: [PATCH net-next 6/8] net: at91_can: add braces {} to all arms of the statement
Date: Sat, 19 Jun 2021 17:56:27 +0800 [thread overview]
Message-ID: <1624096589-13452-7-git-send-email-huangguangbin2@huawei.com> (raw)
In-Reply-To: <1624096589-13452-1-git-send-email-huangguangbin2@huawei.com>
From: Peng Li <lipeng321@huawei.com>
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/can/at91_can.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c
index 394fc72d39ac..5d984a448de4 100644
--- a/drivers/net/can/at91_can.c
+++ b/drivers/net/can/at91_can.c
@@ -585,9 +585,9 @@ static void at91_read_mb(struct net_device *dev, unsigned int mb,
reg_msr = at91_read(priv, AT91_MSR(mb));
cf->len = can_cc_dlc2len((reg_msr >> 16) & 0xf);
- if (reg_msr & AT91_MSR_MRTR)
+ if (reg_msr & AT91_MSR_MRTR) {
cf->can_id |= CAN_RTR_FLAG;
- else {
+ } else {
*(u32 *)(cf->data + 0) = at91_read(priv, AT91_MDL(mb));
*(u32 *)(cf->data + 4) = at91_read(priv, AT91_MDH(mb));
}
@@ -1020,15 +1020,15 @@ static void at91_irq_err(struct net_device *dev)
reg_sr = at91_read(priv, AT91_SR);
/* we need to look at the unmasked reg_sr */
- if (unlikely(reg_sr & AT91_IRQ_BOFF))
+ if (unlikely(reg_sr & AT91_IRQ_BOFF)) {
new_state = CAN_STATE_BUS_OFF;
- else if (unlikely(reg_sr & AT91_IRQ_ERRP))
+ } else if (unlikely(reg_sr & AT91_IRQ_ERRP)) {
new_state = CAN_STATE_ERROR_PASSIVE;
- else if (unlikely(reg_sr & AT91_IRQ_WARN))
+ } else if (unlikely(reg_sr & AT91_IRQ_WARN)) {
new_state = CAN_STATE_ERROR_WARNING;
- else if (likely(reg_sr & AT91_IRQ_ERRA))
+ } else if (likely(reg_sr & AT91_IRQ_ERRA)) {
new_state = CAN_STATE_ERROR_ACTIVE;
- else {
+ } else {
netdev_err(dev, "BUG! hardware in undefined state\n");
return;
}
--
2.8.1
next prev parent reply other threads:[~2021-06-19 9:59 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-19 9:56 [PATCH net-next 0/8] net: at91_can: clean up some code style issues Guangbin Huang
2021-06-19 9:56 ` [PATCH net-next 1/8] net: at91_can: remove redundant blank lines Guangbin Huang
2021-06-19 9:56 ` [PATCH net-next 2/8] net: at91_can: add blank line after declarations Guangbin Huang
2021-06-19 9:56 ` [PATCH net-next 3/8] net: at91_can: fix the code style issue about macro Guangbin Huang
2021-06-19 9:56 ` [PATCH net-next 4/8] net: at91_can: use BIT macro Guangbin Huang
2021-06-19 9:56 ` [PATCH net-next 5/8] net: at91_can: fix the alignment issue Guangbin Huang
2021-06-19 9:56 ` Guangbin Huang [this message]
2021-06-19 9:56 ` [PATCH net-next 7/8] net: at91_can: remove redundant space Guangbin Huang
2021-06-19 9:56 ` [PATCH net-next 8/8] net: at91_can: fix the comments style issue Guangbin Huang
2021-06-19 20:21 ` [PATCH net-next 0/8] net: at91_can: clean up some code style issues Marc Kleine-Budde
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=1624096589-13452-7-git-send-email-huangguangbin2@huawei.com \
--to=huangguangbin2@huawei.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-can@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lipeng321@huawei.com \
--cc=mkl@pengutronix.de \
--cc=netdev@vger.kernel.org \
--cc=wg@grandegger.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).