dma_pool_destroy() can handle NULL pointer correctly, so there is
no need to check NULL pointer before calling dma_pool_destroy().

Signed-off-by: Chengguang Xu <cgxu...@gmx.com>
---
 drivers/scsi/megaraid/megaraid_sas_fusion.c | 28 ++++++++-------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c 
b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index f74b5ea24f0f..a8b07e0bacbb 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -331,15 +331,11 @@ megasas_free_cmds_fusion(struct megasas_instance 
*instance)
                kfree(fusion->cmd_list);
        }
 
-       if (fusion->sg_dma_pool) {
-               dma_pool_destroy(fusion->sg_dma_pool);
-               fusion->sg_dma_pool = NULL;
-       }
-       if (fusion->sense_dma_pool) {
-               dma_pool_destroy(fusion->sense_dma_pool);
-               fusion->sense_dma_pool = NULL;
-       }
+       dma_pool_destroy(fusion->sg_dma_pool);
+       fusion->sg_dma_pool = NULL;
 
+       dma_pool_destroy(fusion->sense_dma_pool);
+       fusion->sense_dma_pool = NULL;
 
        /* Reply Frame, Desc*/
        if (instance->is_rdpq)
@@ -356,10 +352,9 @@ megasas_free_cmds_fusion(struct megasas_instance *instance)
                dma_pool_free(fusion->io_request_frames_pool,
                        fusion->io_request_frames,
                        fusion->io_request_frames_phys);
-       if (fusion->io_request_frames_pool) {
-               dma_pool_destroy(fusion->io_request_frames_pool);
-               fusion->io_request_frames_pool = NULL;
-       }
+
+       dma_pool_destroy(fusion->io_request_frames_pool);
+       fusion->io_request_frames_pool = NULL;
 }
 
 /**
@@ -807,10 +802,8 @@ megasas_free_rdpq_fusion(struct megasas_instance 
*instance) {
 
        }
 
-       if (fusion->reply_frames_desc_pool)
-               dma_pool_destroy(fusion->reply_frames_desc_pool);
-       if (fusion->reply_frames_desc_pool_align)
-               dma_pool_destroy(fusion->reply_frames_desc_pool_align);
+       dma_pool_destroy(fusion->reply_frames_desc_pool);
+       dma_pool_destroy(fusion->reply_frames_desc_pool_align);
 
        if (fusion->rdpq_virt)
                dma_free_coherent(&instance->pdev->dev,
@@ -830,8 +823,7 @@ megasas_free_reply_fusion(struct megasas_instance 
*instance) {
                        fusion->reply_frames_desc[0],
                        fusion->reply_frames_desc_phys[0]);
 
-       if (fusion->reply_frames_desc_pool)
-               dma_pool_destroy(fusion->reply_frames_desc_pool);
+       dma_pool_destroy(fusion->reply_frames_desc_pool);
 
 }
 
-- 
2.17.2

Reply via email to