| Message ID | 20181104135750.19779-2-cgxu519@gmx.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/2] scsi: qla4xxx: remove unnecessary condition check for dma_pool_destroy() | expand |
> -----Original Message----- > From: Chengguang Xu <cgxu519@gmx.com> > Sent: Sunday, November 4, 2018 7:28 PM > To: jejb@linux.vnet.ibm.com; martin.petersen@oracle.com > Cc: Dept-Eng QLogic Storage Upstream <QLogic-Storage- > Upstream@cavium.com>; linux-scsi@vger.kernel.org; Chengguang Xu > <cgxu519@gmx.com> > Subject: [PATCH 2/2] scsi: qla4xxx: remvoe unnecessary condition check for > mempool_destroy() > > External Email > > mempool_destroy() can handle NULL pointer correctly, so there is no need > to check NULL pointer before calling mempool_destroy(). > > Signed-off-by: Chengguang Xu <cgxu519@gmx.com> > --- > drivers/scsi/qla4xxx/ql4_os.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c > index 039950ab1cbc..1c702cd22359 100644 > --- a/drivers/scsi/qla4xxx/ql4_os.c > +++ b/drivers/scsi/qla4xxx/ql4_os.c > @@ -4160,9 +4160,7 @@ static void qla4xxx_mem_free(struct scsi_qla_host > *ha) > ha->fw_dump_size = 0; > > /* Free srb pool. */ > - if (ha->srb_mempool) > - mempool_destroy(ha->srb_mempool); > - > + mempool_destroy(ha->srb_mempool); > ha->srb_mempool = NULL; > > dma_pool_destroy(ha->chap_dma_pool); > -- Thanks Acked-by: Manish Rangankar <Manish.Rangankar@cavium.com>
Chengguang, > mempool_destroy() can handle NULL pointer correctly, so there is > no need to check NULL pointer before calling mempool_destroy(). Applied to 4.21/scsi-queue. Thank you.
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c index 039950ab1cbc..1c702cd22359 100644 --- a/drivers/scsi/qla4xxx/ql4_os.c +++ b/drivers/scsi/qla4xxx/ql4_os.c @@ -4160,9 +4160,7 @@ static void qla4xxx_mem_free(struct scsi_qla_host *ha) ha->fw_dump_size = 0; /* Free srb pool. */ - if (ha->srb_mempool) - mempool_destroy(ha->srb_mempool); - + mempool_destroy(ha->srb_mempool); ha->srb_mempool = NULL; dma_pool_destroy(ha->chap_dma_pool);
mempool_destroy() can handle NULL pointer correctly, so there is no need to check NULL pointer before calling mempool_destroy(). Signed-off-by: Chengguang Xu <cgxu519@gmx.com> --- drivers/scsi/qla4xxx/ql4_os.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)