mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-04 09:34:12 +08:00
scsi: ibmvfc: Mark expected switch fall-throughs
Mark switch cases where we are expecting to fall through. This patch fixes the following warnings: drivers/scsi/ibmvscsi/ibmvfc.c: In function 'ibmvfc_npiv_login_done': drivers/scsi/ibmvscsi/ibmvfc.c:4022:3: warning: this statement may fall through [-Wimplicit-fallthrough=] ibmvfc_retry_host_init(vhost); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/scsi/ibmvscsi/ibmvfc.c:4023:2: note: here case IBMVFC_MAD_DRIVER_FAILED: ^~~~ drivers/scsi/ibmvscsi/ibmvfc.c: In function 'ibmvfc_bsg_request': drivers/scsi/ibmvscsi/ibmvfc.c:1830:11: warning: this statement may fall through [-Wimplicit-fallthrough=] port_id = (bsg_request->rqst_data.h_els.port_id[0] << 16) | ~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ (bsg_request->rqst_data.h_els.port_id[1] << 8) | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ bsg_request->rqst_data.h_els.port_id[2]; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/scsi/ibmvscsi/ibmvfc.c:1833:2: note: here case FC_BSG_RPT_ELS: ^~~~ drivers/scsi/ibmvscsi/ibmvfc.c:1838:11: warning: this statement may fall through [-Wimplicit-fallthrough=] port_id = (bsg_request->rqst_data.h_ct.port_id[0] << 16) | ~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ (bsg_request->rqst_data.h_ct.port_id[1] << 8) | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ bsg_request->rqst_data.h_ct.port_id[2]; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/scsi/ibmvscsi/ibmvfc.c:1841:2: note: here case FC_BSG_RPT_CT: ^~~~ Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> Reviewed-by: Kees Cook <keescook@chromium.org> Acked-by: Tyrel Datwyler <tyreld@linux.ibm.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
parent
e5460f084b
commit
4c73598732
@ -1830,6 +1830,7 @@ static int ibmvfc_bsg_request(struct bsg_job *job)
|
|||||||
port_id = (bsg_request->rqst_data.h_els.port_id[0] << 16) |
|
port_id = (bsg_request->rqst_data.h_els.port_id[0] << 16) |
|
||||||
(bsg_request->rqst_data.h_els.port_id[1] << 8) |
|
(bsg_request->rqst_data.h_els.port_id[1] << 8) |
|
||||||
bsg_request->rqst_data.h_els.port_id[2];
|
bsg_request->rqst_data.h_els.port_id[2];
|
||||||
|
/* fall through */
|
||||||
case FC_BSG_RPT_ELS:
|
case FC_BSG_RPT_ELS:
|
||||||
fc_flags = IBMVFC_FC_ELS;
|
fc_flags = IBMVFC_FC_ELS;
|
||||||
break;
|
break;
|
||||||
@ -1838,6 +1839,7 @@ static int ibmvfc_bsg_request(struct bsg_job *job)
|
|||||||
port_id = (bsg_request->rqst_data.h_ct.port_id[0] << 16) |
|
port_id = (bsg_request->rqst_data.h_ct.port_id[0] << 16) |
|
||||||
(bsg_request->rqst_data.h_ct.port_id[1] << 8) |
|
(bsg_request->rqst_data.h_ct.port_id[1] << 8) |
|
||||||
bsg_request->rqst_data.h_ct.port_id[2];
|
bsg_request->rqst_data.h_ct.port_id[2];
|
||||||
|
/* fall through */
|
||||||
case FC_BSG_RPT_CT:
|
case FC_BSG_RPT_CT:
|
||||||
fc_flags = IBMVFC_FC_CT_IU;
|
fc_flags = IBMVFC_FC_CT_IU;
|
||||||
break;
|
break;
|
||||||
@ -4020,6 +4022,7 @@ static void ibmvfc_npiv_login_done(struct ibmvfc_event *evt)
|
|||||||
return;
|
return;
|
||||||
case IBMVFC_MAD_CRQ_ERROR:
|
case IBMVFC_MAD_CRQ_ERROR:
|
||||||
ibmvfc_retry_host_init(vhost);
|
ibmvfc_retry_host_init(vhost);
|
||||||
|
/* fall through */
|
||||||
case IBMVFC_MAD_DRIVER_FAILED:
|
case IBMVFC_MAD_DRIVER_FAILED:
|
||||||
ibmvfc_free_event(evt);
|
ibmvfc_free_event(evt);
|
||||||
return;
|
return;
|
||||||
|
Loading…
Reference in New Issue
Block a user