| Message ID | 20210409120345.6447-1-linqiheng@huawei.com |
|---|---|
| State | New |
| Headers | show |
| Series | [-next] scsi: qla4xxx: remove unneeded if-null-free check | expand |
On Fri, 9 Apr 2021 20:03:45 +0800, Qiheng Lin wrote: > Eliminate the following coccicheck warning: > > drivers/scsi/qla4xxx/ql4_os.c:4175:2-7: WARNING: > NULL check before some freeing functions is not needed. > drivers/scsi/qla4xxx/ql4_os.c:4196:2-7: WARNING: > NULL check before some freeing functions is not needed. > drivers/scsi/qla4xxx/ql4_os.c:4215:2-7: WARNING: > NULL check before some freeing functions is not needed. > drivers/scsi/qla4xxx/ql4_os.c:6400:2-7: WARNING: > NULL check before some freeing functions is not needed. > drivers/scsi/qla4xxx/ql4_os.c:6402:2-7: WARNING: > NULL check before some freeing functions is not needed. > drivers/scsi/qla4xxx/ql4_os.c:6555:2-7: WARNING: > NULL check before some freeing functions is not needed. > drivers/scsi/qla4xxx/ql4_os.c:6557:2-7: WARNING: > NULL check before some freeing functions is not needed. > drivers/scsi/qla4xxx/ql4_os.c:7838:2-7: WARNING: > NULL check before some freeing functions is not needed. > drivers/scsi/qla4xxx/ql4_os.c:7840:2-7: WARNING: > NULL check before some freeing functions is not needed. Applied to 5.13/scsi-queue, thanks! [1/1] scsi: qla4xxx: remove unneeded if-null-free check https://git.kernel.org/mkp/scsi/c/eb5a3e3b75fe -- Martin K. Petersen Oracle Linux Engineering
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c index 867730ed21f7..ad3afe30f617 100644 --- a/drivers/scsi/qla4xxx/ql4_os.c +++ b/drivers/scsi/qla4xxx/ql4_os.c @@ -4171,8 +4171,7 @@ static void qla4xxx_mem_free(struct scsi_qla_host *ha) dma_free_coherent(&ha->pdev->dev, ha->queues_len, ha->queues, ha->queues_dma); - if (ha->fw_dump) - vfree(ha->fw_dump); + vfree(ha->fw_dump); ha->queues_len = 0; ha->queues = NULL; @@ -4192,8 +4191,7 @@ static void qla4xxx_mem_free(struct scsi_qla_host *ha) dma_pool_destroy(ha->chap_dma_pool); - if (ha->chap_list) - vfree(ha->chap_list); + vfree(ha->chap_list); ha->chap_list = NULL; dma_pool_destroy(ha->fw_ddb_dma_pool); @@ -4211,8 +4209,7 @@ static void qla4xxx_mem_free(struct scsi_qla_host *ha) iounmap(ha->reg); } - if (ha->reset_tmplt.buff) - vfree(ha->reset_tmplt.buff); + vfree(ha->reset_tmplt.buff); pci_release_regions(ha->pdev); } @@ -6396,10 +6393,8 @@ static int qla4xxx_is_session_exists(struct scsi_qla_host *ha, } exit_check: - if (fw_tddb) - vfree(fw_tddb); - if (tmp_tddb) - vfree(tmp_tddb); + vfree(fw_tddb); + vfree(tmp_tddb); return ret; } @@ -6551,10 +6546,8 @@ static int qla4xxx_is_flash_ddb_exists(struct scsi_qla_host *ha, } exit_check: - if (fw_tddb) - vfree(fw_tddb); - if (tmp_tddb) - vfree(tmp_tddb); + vfree(fw_tddb); + vfree(tmp_tddb); return ret; } @@ -7834,10 +7827,8 @@ static int qla4xxx_sysfs_ddb_logout(struct iscsi_bus_flash_session *fnode_sess, ret = -ESRCH; exit_ddb_logout: - if (flash_tddb) - vfree(flash_tddb); - if (tmp_tddb) - vfree(tmp_tddb); + vfree(flash_tddb); + vfree(tmp_tddb); if (fw_ddb_entry) dma_pool_free(ha->fw_ddb_dma_pool, fw_ddb_entry, fw_ddb_dma);
Eliminate the following coccicheck warning: drivers/scsi/qla4xxx/ql4_os.c:4175:2-7: WARNING: NULL check before some freeing functions is not needed. drivers/scsi/qla4xxx/ql4_os.c:4196:2-7: WARNING: NULL check before some freeing functions is not needed. drivers/scsi/qla4xxx/ql4_os.c:4215:2-7: WARNING: NULL check before some freeing functions is not needed. drivers/scsi/qla4xxx/ql4_os.c:6400:2-7: WARNING: NULL check before some freeing functions is not needed. drivers/scsi/qla4xxx/ql4_os.c:6402:2-7: WARNING: NULL check before some freeing functions is not needed. drivers/scsi/qla4xxx/ql4_os.c:6555:2-7: WARNING: NULL check before some freeing functions is not needed. drivers/scsi/qla4xxx/ql4_os.c:6557:2-7: WARNING: NULL check before some freeing functions is not needed. drivers/scsi/qla4xxx/ql4_os.c:7838:2-7: WARNING: NULL check before some freeing functions is not needed. drivers/scsi/qla4xxx/ql4_os.c:7840:2-7: WARNING: NULL check before some freeing functions is not needed. Signed-off-by: Qiheng Lin <linqiheng@huawei.com> --- drivers/scsi/qla4xxx/ql4_os.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-)