Commit 75c1d48a authored Dec 02, 2018 by Thomas Meyer Committed by Martin K. Petersen Dec 07, 2018

scsi: qla2xxx: 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: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent f3e46ac4

drivers/scsi/qla2xxx/qla_os.c

+8 −16

Original line number	Diff line number	Diff line
		@@ -4183,11 +4183,9 @@ qla2x00_mem_alloc(struct qla_hw_data *ha, uint16_t req_len, uint16_t rsp_len,
		kfree(ha->nvram);
		ha->nvram = NULL;
		fail_free_ctx_mempool:
		if (ha->ctx_mempool)
		mempool_destroy(ha->ctx_mempool);
		ha->ctx_mempool = NULL;
		fail_free_srb_mempool:
		if (ha->srb_mempool)
		mempool_destroy(ha->srb_mempool);
		ha->srb_mempool = NULL;
		fail_free_gid_list:
		@@ -4490,7 +4488,6 @@ qla2x00_mem_free(struct qla_hw_data *ha)
		dma_free_coherent(&ha->pdev->dev, MCTP_DUMP_SIZE, ha->mctp_dump,
		ha->mctp_dump_dma);

		if (ha->srb_mempool)
		mempool_destroy(ha->srb_mempool);

		if (ha->dcbx_tlv)
		@@ -4523,7 +4520,6 @@ qla2x00_mem_free(struct qla_hw_data *ha)
		if (ha->async_pd)
		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);

		if (ha->gid_list)
		@@ -4545,13 +4541,10 @@ qla2x00_mem_free(struct qla_hw_data *ha)
		}
		}

		if (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);

		if (ha->ctx_mempool)
		mempool_destroy(ha->ctx_mempool);

		qlt_mem_free(ha);
		@@ -7098,7 +7091,6 @@ qla2x00_module_exit(void)
		qla2x00_release_firmware();
		kmem_cache_destroy(srb_cachep);
		qlt_exit();
		if (ctx_cachep)
		kmem_cache_destroy(ctx_cachep);
		fc_release_transport(qla2xxx_transport_template);
		fc_release_transport(qla2xxx_transport_vport_template);