scsi: qla2xxx: remove redundant NULL check
Subsystems (3)
PATCH 1/2 scsi: qla2xxx: remove redundant NULL check
Fix below warnings reported by coccicheck:
./drivers/scsi/qla2xxx/qla_init.c:3371:2-7: WARNING: NULL check before some freeing functions is not needed. ./drivers/scsi/qla2xxx/qla_init.c:7855:5-10: WARNING: NULL check before some freeing functions is not needed. ./drivers/scsi/qla2xxx/qla_init.c:7916:2-7: WARNING: NULL check before some freeing functions is not needed. ./drivers/scsi/qla2xxx/qla_init.c:8113:4-18: WARNING: NULL check before some freeing functions is not needed. ./drivers/scsi/qla2xxx/qla_init.c:8174:2-7: WARNING: NULL check before some freeing functions is not needed.
--- drivers/scsi/qla2xxx/qla_init.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
drivers/scsi/qla2xxx/qla_init.c +5 -10
@@ -3371,8 +3371,7 @@ static void qla2x00_tmf_sp_done(srb_t *sp, int res)"Re-Allocated (%d KB) and save firmware dump.\n" , dump_size / 1024); }else { -if (ha->fw_dump) -vfree (ha->fw_dump); +vfree (ha->fw_dump); ha->fw_dump = fw_dump; ha->fw_dump_len = ha->fw_dump_alloc_len =
@@ -7855,8 +7854,7 @@ bool qla24xx_risc_firmware_invalid(uint32_t *dword) templates = (risc_attr &BIT_9 ) ?2 :1 ;ql_dbg (ql_dbg_init, vha,0x0160 ,"-> templates = %u\n" , templates);for (j =0 ; j < templates; j++, fwdt++) { -if (fwdt->template) -vfree (fwdt->template); +vfree (fwdt->template); fwdt->template =NULL ; fwdt->length =0 ;
@@ -7916,8 +7914,7 @@ bool qla24xx_risc_firmware_invalid(uint32_t *dword)return QLA_SUCCESS ; failed: -if (fwdt->template) -vfree (fwdt->template); +vfree (fwdt->template); fwdt->template =NULL ; fwdt->length =0 ;
@@ -8113,8 +8110,7 @@ bool qla24xx_risc_firmware_invalid(uint32_t *dword) templates = (risc_attr &BIT_9 ) ?2 :1 ;ql_dbg (ql_dbg_init, vha,0x0170 ,"-> templates = %u\n" , templates);for (j =0 ; j < templates; j++, fwdt++) { -if (fwdt->template) -vfree (fwdt->template); +vfree (fwdt->template); fwdt->template =NULL ; fwdt->length =0 ;
@@ -8174,8 +8170,7 @@ bool qla24xx_risc_firmware_invalid(uint32_t *dword)return QLA_SUCCESS ; failed: -if (fwdt->template) -vfree (fwdt->template); +vfree (fwdt->template); fwdt->template =NULL ; fwdt->length =0 ;
Signature · 1 line
1.8.3.1
PATCH 2/2 scsi: qla4xxx: remove redundant NULL check
Fix below warnings reported by coccicheck:
./drivers/scsi/qla4xxx/ql4_os.c:4171:2-7: WARNING: NULL check before some freeing functions is not needed. ./drivers/scsi/qla4xxx/ql4_os.c:4192:2-7: WARNING: NULL check before some freeing functions is not needed. ./drivers/scsi/qla4xxx/ql4_os.c:4211:2-7: WARNING: NULL check before some freeing functions is not needed. ./drivers/scsi/qla4xxx/ql4_os.c:6396:2-7: WARNING: NULL check before some freeing functions is not needed. ./drivers/scsi/qla4xxx/ql4_os.c:6551: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.
--- drivers/scsi/qla4xxx/ql4_os.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-)
drivers/scsi/qla4xxx/ql4_os.c +9 -18
@@ -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);
Signature · 1 line
1.8.3.1