Commit 75c1d48a authored by Thomas Meyer's avatar Thomas Meyer Committed by Martin K. Petersen

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

NULL check before some freeing functions is not needed.
Signed-off-by: default avatarThomas Meyer <thomas@m3y3r.de>
Acked-by: default avatarHimanshu Madhani <hmadhani@marvell.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent f3e46ac4
...@@ -4183,12 +4183,10 @@ qla2x00_mem_alloc(struct qla_hw_data *ha, uint16_t req_len, uint16_t rsp_len, ...@@ -4183,12 +4183,10 @@ qla2x00_mem_alloc(struct qla_hw_data *ha, uint16_t req_len, uint16_t rsp_len,
kfree(ha->nvram); kfree(ha->nvram);
ha->nvram = NULL; ha->nvram = NULL;
fail_free_ctx_mempool: fail_free_ctx_mempool:
if (ha->ctx_mempool) mempool_destroy(ha->ctx_mempool);
mempool_destroy(ha->ctx_mempool);
ha->ctx_mempool = NULL; ha->ctx_mempool = NULL;
fail_free_srb_mempool: fail_free_srb_mempool:
if (ha->srb_mempool) mempool_destroy(ha->srb_mempool);
mempool_destroy(ha->srb_mempool);
ha->srb_mempool = NULL; ha->srb_mempool = NULL;
fail_free_gid_list: fail_free_gid_list:
dma_free_coherent(&ha->pdev->dev, qla2x00_gid_list_size(ha), dma_free_coherent(&ha->pdev->dev, qla2x00_gid_list_size(ha),
...@@ -4490,8 +4488,7 @@ qla2x00_mem_free(struct qla_hw_data *ha) ...@@ -4490,8 +4488,7 @@ qla2x00_mem_free(struct qla_hw_data *ha)
dma_free_coherent(&ha->pdev->dev, MCTP_DUMP_SIZE, ha->mctp_dump, dma_free_coherent(&ha->pdev->dev, MCTP_DUMP_SIZE, ha->mctp_dump,
ha->mctp_dump_dma); ha->mctp_dump_dma);
if (ha->srb_mempool) mempool_destroy(ha->srb_mempool);
mempool_destroy(ha->srb_mempool);
if (ha->dcbx_tlv) if (ha->dcbx_tlv)
dma_free_coherent(&ha->pdev->dev, DCBX_TLV_DATA_SIZE, dma_free_coherent(&ha->pdev->dev, DCBX_TLV_DATA_SIZE,
...@@ -4523,8 +4520,7 @@ qla2x00_mem_free(struct qla_hw_data *ha) ...@@ -4523,8 +4520,7 @@ qla2x00_mem_free(struct qla_hw_data *ha)
if (ha->async_pd) if (ha->async_pd)
dma_pool_free(ha->s_dma_pool, ha->async_pd, ha->async_pd_dma); dma_pool_free(ha->s_dma_pool, ha->async_pd, ha->async_pd_dma);
if (ha->s_dma_pool) dma_pool_destroy(ha->s_dma_pool);
dma_pool_destroy(ha->s_dma_pool);
if (ha->gid_list) if (ha->gid_list)
dma_free_coherent(&ha->pdev->dev, qla2x00_gid_list_size(ha), dma_free_coherent(&ha->pdev->dev, qla2x00_gid_list_size(ha),
...@@ -4545,14 +4541,11 @@ qla2x00_mem_free(struct qla_hw_data *ha) ...@@ -4545,14 +4541,11 @@ qla2x00_mem_free(struct qla_hw_data *ha)
} }
} }
if (ha->dl_dma_pool) dma_pool_destroy(ha->dl_dma_pool);
dma_pool_destroy(ha->dl_dma_pool);
if (ha->fcp_cmnd_dma_pool) dma_pool_destroy(ha->fcp_cmnd_dma_pool);
dma_pool_destroy(ha->fcp_cmnd_dma_pool);
if (ha->ctx_mempool) mempool_destroy(ha->ctx_mempool);
mempool_destroy(ha->ctx_mempool);
qlt_mem_free(ha); qlt_mem_free(ha);
...@@ -7098,8 +7091,7 @@ qla2x00_module_exit(void) ...@@ -7098,8 +7091,7 @@ qla2x00_module_exit(void)
qla2x00_release_firmware(); qla2x00_release_firmware();
kmem_cache_destroy(srb_cachep); kmem_cache_destroy(srb_cachep);
qlt_exit(); qlt_exit();
if (ctx_cachep) kmem_cache_destroy(ctx_cachep);
kmem_cache_destroy(ctx_cachep);
fc_release_transport(qla2xxx_transport_template); fc_release_transport(qla2xxx_transport_template);
fc_release_transport(qla2xxx_transport_vport_template); fc_release_transport(qla2xxx_transport_vport_template);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment