scsi: qla2xxx: Remove redundant NULL check
authorYang Li <abaci-bugfix@linux.alibaba.com>
Fri, 22 Jan 2021 09:02:53 +0000 (17:02 +0800)
committerMartin K. Petersen <martin.petersen@oracle.com>
Sat, 23 Jan 2021 03:29:09 +0000 (22:29 -0500)
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.

Link: https://lore.kernel.org/r/1611306174-92627-1-git-send-email-abaci-bugfix@linux.alibaba.com
Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: Yang Li <abaci-bugfix@linux.alibaba.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/qla2xxx/qla_init.c

index ca844e3..f01f071 100644 (file)
@@ -3375,8 +3375,7 @@ qla2x00_alloc_fw_dump(scsi_qla_host_t *vha)
                                    "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 =
@@ -7876,8 +7875,7 @@ qla24xx_load_risc_flash(scsi_qla_host_t *vha, uint32_t *srisc_addr,
        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;
 
@@ -7937,8 +7935,7 @@ qla24xx_load_risc_flash(scsi_qla_host_t *vha, uint32_t *srisc_addr,
        return QLA_SUCCESS;
 
 failed:
-       if (fwdt->template)
-               vfree(fwdt->template);
+       vfree(fwdt->template);
        fwdt->template = NULL;
        fwdt->length = 0;
 
@@ -8134,8 +8131,7 @@ qla24xx_load_risc_blob(scsi_qla_host_t *vha, uint32_t *srisc_addr)
        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;
 
@@ -8195,8 +8191,7 @@ qla24xx_load_risc_blob(scsi_qla_host_t *vha, uint32_t *srisc_addr)
        return QLA_SUCCESS;
 
 failed:
-       if (fwdt->template)
-               vfree(fwdt->template);
+       vfree(fwdt->template);
        fwdt->template = NULL;
        fwdt->length = 0;