can: at91_can: fix fall-through annotations
PATCH 1/1 can: at91_can: fix fall-through annotations
Properly place the "fall through" annotations at the bottom of the case, which is what GCC is expecting to find.
This fix is part of the ongoing efforts to enabling -Wimplicit-fallthrough
Addresses-Coverity-ID: 1222851 ("Missing break in switch")
Addresses-Coverity-ID: 402011 ("Missing break in switch")
Signed-off-by Gustavo A. R. Silva <[email protected]>
--- drivers/net/can/at91_can.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/can/at91_can.c +4 -2
@@ -902,7 +902,8 @@ static void at91_irq_err_state(struct net_device *dev, CAN_ERR_CRTL_TX_WARNING :CAN_ERR_CRTL_RX_WARNING ; } -case CAN_STATE_ERROR_WARNING :/* fallthrough */ +/* fall through */ +case CAN_STATE_ERROR_WARNING :/* * from: ERROR_ACTIVE, ERROR_WARNING * to : ERROR_PASSIVE, BUS_OFF
@@ -951,7 +952,8 @@ static void at91_irq_err_state(struct net_device *dev,netdev_dbg (dev,"Error Active\n" ); cf->can_id |=CAN_ERR_PROT ; cf->data[2 ] =CAN_ERR_PROT_ACTIVE ; -case CAN_STATE_ERROR_WARNING :/* fallthrough */ +/* fall through */ +case CAN_STATE_ERROR_WARNING : reg_idr =AT91_IRQ_ERRA |AT91_IRQ_WARN |AT91_IRQ_BOFF ; reg_ier =AT91_IRQ_ERRP ;break ;
Signature · 1 line
2.7.4
Quoted 8 lines · Gustavo A. R. Silva
Properly place the "fall through" annotations at the bottom of the case, which is what GCC is expecting to find.
This fix is part of the ongoing efforts to enabling -Wimplicit-fallthrough
Addresses-Coverity-ID: 1222851 ("Missing break in switch")
Addresses-Coverity-ID: 402011 ("Missing break in switch")Signed-off-by Gustavo A. R. Silva <[email protected]>
Seems good to me (but I preferred the previous annotation ;))
Reviewed-by Alexandre Belloni <[email protected]>
Quoted 31 lines
--- drivers/net/can/at91_can.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/net/can/at91_can.c +4
-2@@ -902,7 +902,8 @@ static void at91_irq_err_state(struct net_device *dev, CAN_ERR_CRTL_TX_WARNING :CAN_ERR_CRTL_RX_WARNING ; } -case CAN_STATE_ERROR_WARNING :/* fallthrough */ +/* fall through */ +case CAN_STATE_ERROR_WARNING :/* * from: ERROR_ACTIVE, ERROR_WARNING * to : ERROR_PASSIVE, BUS_OFF @@ -951,7 +952,8 @@ static void at91_irq_err_state(struct net_device *dev,netdev_dbg (dev,"Error Active\n" ); cf->can_id |=CAN_ERR_PROT ; cf->data[2 ] =CAN_ERR_PROT_ACTIVE ; -case CAN_STATE_ERROR_WARNING :/* fallthrough */ +/* fall through */ +case CAN_STATE_ERROR_WARNING : reg_idr =AT91_IRQ_ERRA |AT91_IRQ_WARN |AT91_IRQ_BOFF ; reg_ier =AT91_IRQ_ERRP ;break ;Signature · 1 line
2.7.4
Signature · 3 lines
Alexandre Belloni, Bootlin Embedded Linux and Kernel engineering https://bootlin.com