From: Gustavo A. R. Silva Date: Tue, 22 Aug 2017 20:53:53 +0000 (-0500) Subject: scsi: lpfc: remove useless code in lpfc_sli4_bsg_link_diag_test X-Git-Tag: v4.1.12-124.31.3~1009 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5de2b6ac4ac5ac6589b1274cfac3d30b547b3780;p=users%2Fjedix%2Flinux-maple.git scsi: lpfc: remove useless code in lpfc_sli4_bsg_link_diag_test Orabug: 27631736 Remove variable assignments. The value stored in local variable _rc_ is overwritten at line 2448:rc = lpfc_sli4_bsg_set_link_diag_state(phba, 0); before it can be used. Addresses-Coverity-ID: 1226935 Signed-off-by: Gustavo A. R. Silva Acked-by: James Smart Signed-off-by: Martin K. Petersen (cherry picked from commit 44ed33e6c5d58342a9bc86172ad121c0687bb890) Signed-off-by: Dick dkennedy Signed-off-by: Dan Duval Reviewed-by: Jack Vogel --- diff --git a/drivers/scsi/lpfc/lpfc_bsg.c b/drivers/scsi/lpfc/lpfc_bsg.c index c5b7a6e7bd21..772fb6d42d16 100644 --- a/drivers/scsi/lpfc/lpfc_bsg.c +++ b/drivers/scsi/lpfc/lpfc_bsg.c @@ -2345,20 +2345,17 @@ lpfc_sli4_bsg_link_diag_test(struct fc_bsg_job *job) goto job_error; pmboxq = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL); - if (!pmboxq) { - rc = -ENOMEM; + if (!pmboxq) goto link_diag_test_exit; - } req_len = (sizeof(struct lpfc_mbx_set_link_diag_state) - sizeof(struct lpfc_sli4_cfg_mhdr)); alloc_len = lpfc_sli4_config(phba, pmboxq, LPFC_MBOX_SUBSYSTEM_FCOE, LPFC_MBOX_OPCODE_FCOE_LINK_DIAG_STATE, req_len, LPFC_SLI4_MBX_EMBED); - if (alloc_len != req_len) { - rc = -ENOMEM; + if (alloc_len != req_len) goto link_diag_test_exit; - } + run_link_diag_test = &pmboxq->u.mqe.un.link_diag_test; bf_set(lpfc_mbx_run_diag_test_link_num, &run_link_diag_test->u.req, phba->sli4_hba.lnk_info.lnk_no);