Message ID | 20220824075123.221316-1-ye.xingchen@zte.com.cn (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
Series | [linux-next] scsi: lpfc: Remove unneeded result variable | expand |
On 8/24/2022 12:51 AM, cgel.zte@gmail.com wrote: > From: ye xingchen <ye.xingchen@zte.com.cn> > > Return the value from lpfc_issue_reg_vfi() directly instead of storing it > in another redundant variable. > > Reported-by: Zeal Robot <zealci@zte.com.cn> > Signed-off-by: ye xingchen <ye.xingchen@zte.com.cn> > --- > drivers/scsi/lpfc/lpfc_bsg.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/drivers/scsi/lpfc/lpfc_bsg.c b/drivers/scsi/lpfc/lpfc_bsg.c > index 9be3bb01a8ec..ac0c7ccf2eae 100644 > --- a/drivers/scsi/lpfc/lpfc_bsg.c > +++ b/drivers/scsi/lpfc/lpfc_bsg.c > @@ -1977,8 +1977,6 @@ lpfc_sli4_bsg_set_loopback_mode(struct lpfc_hba *phba, int mode, > static int > lpfc_sli4_diag_fcport_reg_setup(struct lpfc_hba *phba) > { > - int rc; > - > if (phba->pport->fc_flag & FC_VFI_REGISTERED) { > lpfc_printf_log(phba, KERN_WARNING, LOG_LIBDFC, > "3136 Port still had vfi registered: " > @@ -1988,8 +1986,7 @@ lpfc_sli4_diag_fcport_reg_setup(struct lpfc_hba *phba) > phba->vpi_ids[phba->pport->vpi]); > return -EINVAL; > } > - rc = lpfc_issue_reg_vfi(phba->pport); > - return rc; > + return lpfc_issue_reg_vfi(phba->pport); > } > > /** Thanks Reviewed-by: James Smart <jsmart2021@gmail.com> -- james
> Return the value from lpfc_issue_reg_vfi() directly instead of storing > it in another redundant variable. Applied to 6.1/scsi-staging, thanks!
diff --git a/drivers/scsi/lpfc/lpfc_bsg.c b/drivers/scsi/lpfc/lpfc_bsg.c index 9be3bb01a8ec..ac0c7ccf2eae 100644 --- a/drivers/scsi/lpfc/lpfc_bsg.c +++ b/drivers/scsi/lpfc/lpfc_bsg.c @@ -1977,8 +1977,6 @@ lpfc_sli4_bsg_set_loopback_mode(struct lpfc_hba *phba, int mode, static int lpfc_sli4_diag_fcport_reg_setup(struct lpfc_hba *phba) { - int rc; - if (phba->pport->fc_flag & FC_VFI_REGISTERED) { lpfc_printf_log(phba, KERN_WARNING, LOG_LIBDFC, "3136 Port still had vfi registered: " @@ -1988,8 +1986,7 @@ lpfc_sli4_diag_fcport_reg_setup(struct lpfc_hba *phba) phba->vpi_ids[phba->pport->vpi]); return -EINVAL; } - rc = lpfc_issue_reg_vfi(phba->pport); - return rc; + return lpfc_issue_reg_vfi(phba->pport); } /**