diff mbox series

[-next] scsi: qla2xxx: remove unneeded if-null-free check

Message ID 20210409120925.7122-1-linqiheng@huawei.com
State New
Headers show
Series [-next] scsi: qla2xxx: remove unneeded if-null-free check | expand

Commit Message

Qiheng Lin April 9, 2021, 12:09 p.m. UTC
Eliminate the following coccicheck warning:

drivers/scsi/qla2xxx/qla_os.c:4622:2-7:
 WARNING: NULL check before some freeing functions is not needed.
drivers/scsi/qla2xxx/qla_os.c:4637:3-8:
 WARNING: NULL check before some freeing functions is not needed.

Signed-off-by: Qiheng Lin <linqiheng@huawei.com>
---
 drivers/scsi/qla2xxx/qla_os.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Martin K. Petersen April 16, 2021, 2:51 a.m. UTC | #1
On Fri, 9 Apr 2021 20:09:25 +0800, Qiheng Lin wrote:

> Eliminate the following coccicheck warning:

> 

> drivers/scsi/qla2xxx/qla_os.c:4622:2-7:

>  WARNING: NULL check before some freeing functions is not needed.

> drivers/scsi/qla2xxx/qla_os.c:4637:3-8:

>  WARNING: NULL check before some freeing functions is not needed.


Applied to 5.13/scsi-queue, thanks!

[1/1] scsi: qla2xxx: remove unneeded if-null-free check
      https://git.kernel.org/mkp/scsi/c/efd2617100d9

-- 
Martin K. Petersen	Oracle Linux Engineering
diff mbox series

Patch

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 12959e3874cb..d74c32f84ef5 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -4618,8 +4618,7 @@  qla2x00_free_fw_dump(struct qla_hw_data *ha)
 		dma_free_coherent(&ha->pdev->dev,
 		    EFT_SIZE, ha->eft, ha->eft_dma);
 
-	if (ha->fw_dump)
-		vfree(ha->fw_dump);
+	vfree(ha->fw_dump);
 
 	ha->fce = NULL;
 	ha->fce_dma = 0;
@@ -4633,8 +4632,7 @@  qla2x00_free_fw_dump(struct qla_hw_data *ha)
 	ha->fw_dump_len = 0;
 
 	for (j = 0; j < 2; j++, fwdt++) {
-		if (fwdt->template)
-			vfree(fwdt->template);
+		vfree(fwdt->template);
 		fwdt->template = NULL;
 		fwdt->length = 0;
 	}