Commit 02400533 authored by Peng Li's avatar Peng Li Committed by Marc Kleine-Budde
Browse files

net: at91_can: add braces {} to all arms of the statement

parent ccc5f1c9
Loading
Loading
Loading
Loading
+7 −7
Original line number Diff line number Diff line
@@ -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;
		}