| Message ID | 5671efc6.ZwH5WdfbRkt48aQV%james.smart@avagotech.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
On 12/17/2015 12:12 AM, James Smart wrote: > > From: Markus Elfring <elfring@users.sourceforge.net> > > The mempool_destroy() function tests whether its argument is NULL > and then returns immediately. Thus the test around the calls is not needed. > > This issue was detected by using the Coccinelle software. > > Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> > Signed-off-by: James Smart <james.smart@avagotech.com> > --- > drivers/scsi/lpfc/lpfc_mem.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/scsi/lpfc/lpfc_mem.c b/drivers/scsi/lpfc/lpfc_mem.c > index 3fa6533..4fb3581 100644 > --- a/drivers/scsi/lpfc/lpfc_mem.c > +++ b/drivers/scsi/lpfc/lpfc_mem.c > @@ -231,15 +231,13 @@ lpfc_mem_free(struct lpfc_hba *phba) > if (phba->lpfc_hbq_pool) > pci_pool_destroy(phba->lpfc_hbq_pool); > phba->lpfc_hbq_pool = NULL; > - > - if (phba->rrq_pool) > - mempool_destroy(phba->rrq_pool); > + mempool_destroy(phba->rrq_pool); > phba->rrq_pool = NULL; > > /* Free NLP memory pool */ > mempool_destroy(phba->nlp_mem_pool); > phba->nlp_mem_pool = NULL; > - if (phba->sli_rev == LPFC_SLI_REV4 && phba->active_rrq_pool) { > + if (phba->sli_rev == LPFC_SLI_REV4) { > mempool_destroy(phba->active_rrq_pool); > phba->active_rrq_pool = NULL; > } > Reviewed-by: Hannes Reinecke <hare@suse.com> Cheers, Hannes
James Smart wrote: > From: Markus Elfring <elfring@users.sourceforge.net> > > The mempool_destroy() function tests whether its argument is NULL > and then returns immediately. Thus the test around the calls is not needed. > > This issue was detected by using the Coccinelle software. > > Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> > Signed-off-by: James Smart <james.smart@avagotech.com> Reviewed-by: Sebastian Herbszt <herbszt@gmx.de> -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/scsi/lpfc/lpfc_mem.c b/drivers/scsi/lpfc/lpfc_mem.c index 3fa6533..4fb3581 100644 --- a/drivers/scsi/lpfc/lpfc_mem.c +++ b/drivers/scsi/lpfc/lpfc_mem.c @@ -231,15 +231,13 @@ lpfc_mem_free(struct lpfc_hba *phba) if (phba->lpfc_hbq_pool) pci_pool_destroy(phba->lpfc_hbq_pool); phba->lpfc_hbq_pool = NULL; - - if (phba->rrq_pool) - mempool_destroy(phba->rrq_pool); + mempool_destroy(phba->rrq_pool); phba->rrq_pool = NULL; /* Free NLP memory pool */ mempool_destroy(phba->nlp_mem_pool); phba->nlp_mem_pool = NULL; - if (phba->sli_rev == LPFC_SLI_REV4 && phba->active_rrq_pool) { + if (phba->sli_rev == LPFC_SLI_REV4) { mempool_destroy(phba->active_rrq_pool); phba->active_rrq_pool = NULL; }