mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 15:18:19 +00:00
net: at91_can: add braces {} to all arms of the statement
Braces {} should be used on all arms of this statement. Link: https://lore.kernel.org/r/1624096589-13452-7-git-send-email-huangguangbin2@huawei.com Signed-off-by: Peng Li <lipeng321@huawei.com> Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
This commit is contained in:
parent
ccc5f1c994
commit
02400533bb
1 changed files with 7 additions and 7 deletions
|
@ -585,9 +585,9 @@ static void at91_read_mb(struct net_device *dev, unsigned int mb,
|
||||||
reg_msr = at91_read(priv, AT91_MSR(mb));
|
reg_msr = at91_read(priv, AT91_MSR(mb));
|
||||||
cf->len = can_cc_dlc2len((reg_msr >> 16) & 0xf);
|
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;
|
cf->can_id |= CAN_RTR_FLAG;
|
||||||
else {
|
} else {
|
||||||
*(u32 *)(cf->data + 0) = at91_read(priv, AT91_MDL(mb));
|
*(u32 *)(cf->data + 0) = at91_read(priv, AT91_MDL(mb));
|
||||||
*(u32 *)(cf->data + 4) = at91_read(priv, AT91_MDH(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);
|
reg_sr = at91_read(priv, AT91_SR);
|
||||||
|
|
||||||
/* we need to look at the unmasked reg_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;
|
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;
|
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;
|
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;
|
new_state = CAN_STATE_ERROR_ACTIVE;
|
||||||
else {
|
} else {
|
||||||
netdev_err(dev, "BUG! hardware in undefined state\n");
|
netdev_err(dev, "BUG! hardware in undefined state\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue