scsi: megaraid_sas: NULL check before some freeing functions is not needed

NULL check before some freeing functions is not needed.

Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
Acked-by: Sumit Saxena <sumit.saxena@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
index 3b7abe5ca7f5d56e417ce9b25528ce7eb9a11cb9..7f9ba88d1c2d207faa3a9f84a2279f1ab1ca7bd8 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
@@ -1243,8 +1243,7 @@ megaraid_mbox_teardown_dma_pools(adapter_t *adapter)
                dma_pool_free(raid_dev->sg_pool_handle, sg_pci_blk[i].vaddr,
                        sg_pci_blk[i].dma_addr);
        }
-       if (raid_dev->sg_pool_handle)
-               dma_pool_destroy(raid_dev->sg_pool_handle);
+       dma_pool_destroy(raid_dev->sg_pool_handle);
 
 
        epthru_pci_blk = raid_dev->epthru_pool;
@@ -1252,8 +1251,7 @@ megaraid_mbox_teardown_dma_pools(adapter_t *adapter)
                dma_pool_free(raid_dev->epthru_pool_handle,
                        epthru_pci_blk[i].vaddr, epthru_pci_blk[i].dma_addr);
        }
-       if (raid_dev->epthru_pool_handle)
-               dma_pool_destroy(raid_dev->epthru_pool_handle);
+       dma_pool_destroy(raid_dev->epthru_pool_handle);
 
 
        mbox_pci_blk = raid_dev->mbox_pool;
@@ -1261,8 +1259,7 @@ megaraid_mbox_teardown_dma_pools(adapter_t *adapter)
                dma_pool_free(raid_dev->mbox_pool_handle,
                        mbox_pci_blk[i].vaddr, mbox_pci_blk[i].dma_addr);
        }
-       if (raid_dev->mbox_pool_handle)
-               dma_pool_destroy(raid_dev->mbox_pool_handle);
+       dma_pool_destroy(raid_dev->mbox_pool_handle);
 
        return;
 }

diff --git a/drivers/scsi/megaraid/megaraid_mm.c b/drivers/scsi/megaraid/megaraid_mm.c
index 8428247015db6f0c0b5890054e90bb741614feb6..3ce837e4b24c330c650ee5a0642f133a66558119 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_mm.c
+++ b/drivers/scsi/megaraid/megaraid_mm.c
@@ -1017,8 +1017,7 @@ memalloc_error:
        kfree(adapter->kioc_list);
        kfree(adapter->mbox_list);
 
-       if (adapter->pthru_dma_pool)
-               dma_pool_destroy(adapter->pthru_dma_pool);
+       dma_pool_destroy(adapter->pthru_dma_pool);
 
        kfree(adapter);
 

diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index 8f37ad83be9a3f3fca445d4a0ed1d370f0f65c80..f2cbdcaef6068a2ddbeb4e046dac6f9f45c3fcb8 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -807,10 +807,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 +828,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);
 
 }
 
@@ -1623,8 +1620,7 @@ static inline void megasas_free_ioc_init_cmd(struct megasas_instance *instance)
                                  fusion->ioc_init_cmd->frame,
                                  fusion->ioc_init_cmd->frame_phys_addr);
 
-       if (fusion->ioc_init_cmd)
-               kfree(fusion->ioc_init_cmd);
+       kfree(fusion->ioc_init_cmd);
 }
 
 /**