cnic: Refactor code and mark expected switch fall-through
Subsystems (2)
PATCH 1/1 cnic: Refactor code and mark expected switch fall-through
In preparation to enabling -Wimplicit-fallthrough, refactor code a bit and mark switch cases where we are expecting to fall through.
This patch fixes the following warning:
drivers/net/ethernet/broadcom/cnic.c: In function ‘cnic_cm_process_kcqe’:drivers/net/ethernet/broadcom/cnic.c:4044:11: warning: this statement may fall through [-Wimplicit-fallthrough=]
opcode = L4_KCQE_OPCODE_VALUE_CLOSE_COMP;
drivers/net/ethernet/broadcom/cnic.c:4050:2: note: here
case L4_KCQE_OPCODE_VALUE_RESET_RECEIVED:
^~~~
Warning level 3 was used: -Wimplicit-fallthrough=3
Notice that, in this particular case, the code comment is modified in accordance with what GCC is expecting to find.
This patch is part of the ongoing efforts to enable -Wimplicit-fallthrough.
--- drivers/net/ethernet/broadcom/cnic.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/net/ethernet/broadcom/cnic.c +6 -7
@@ -4038,15 +4038,14 @@ static void cnic_cm_process_kcqe(struct cnic_dev *dev, struct kcqe *kcqe)case L5CM_RAMROD_CMD_ID_CLOSE : {struct iscsi_kcqe *l5kcqe = (struct iscsi_kcqe *) kcqe; -if (l4kcqe->status !=0 || l5kcqe->completion_status !=0 ) { -netdev_warn (dev->netdev,"RAMROD CLOSE compl with status 0x%x completion status 0x%x\n" , - l4kcqe->status, l5kcqe->completion_status); - opcode =L4_KCQE_OPCODE_VALUE_CLOSE_COMP ; -/* Fall through */ - }else { +if (l4kcqe->status ==0 && l5kcqe->completion_status ==0 )break ; - } + +netdev_warn (dev->netdev,"RAMROD CLOSE compl with status 0x%x completion status 0x%x\n" , + l4kcqe->status, l5kcqe->completion_status); + opcode =L4_KCQE_OPCODE_VALUE_CLOSE_COMP ; } +/* Fall through */ case L4_KCQE_OPCODE_VALUE_RESET_RECEIVED :case L4_KCQE_OPCODE_VALUE_CLOSE_COMP :case L4_KCQE_OPCODE_VALUE_RESET_COMP :
Signature · 1 line
2.21.0
From: "Gustavo A. R. Silva" <[email protected]>
Date: Wed, 24 Apr 2019 11:37:32 -0500
Quoted 14 lines
In preparation to enabling -Wimplicit-fallthrough, refactor code a bit and mark switch cases where we are expecting to fall through.
This patch fixes the following warning:
drivers/net/ethernet/broadcom/cnic.c: In function ‘cnic_cm_process_kcqe’:drivers/net/ethernet/broadcom/cnic.c:4044:11: warning: this statement may fall through [-Wimplicit-fallthrough=]opcode = L4_KCQE_OPCODE_VALUE_CLOSE_COMP;
drivers/net/ethernet/broadcom/cnic.c:4050:2: note: here
caseL4_KCQE_OPCODE_VALUE_RESET_RECEIVED:
^~~~Warning level 3 was used: -Wimplicit-fallthrough=3
Quoted 7 lines
Notice that, in this particular case, the code comment is modified in accordance with what GCC is expecting to find.
This patch is part of the ongoing efforts to enable -Wimplicit-fallthrough.
Signed-off-by Gustavo A. R. Silva <[email protected]>
Applied.