2021-04-09 12:10:43

by Qiheng Lin

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

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 <[email protected]>
---
drivers/scsi/qla2xxx/qla_os.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

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;
}
--
2.31.1

2021-04-09 14:18:14

by Himanshu Madhani

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

> On Apr 9, 2021, at 7:09 AM, Qiheng Lin <[email protected]> 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.
>
> Signed-off-by: Qiheng Lin <[email protected]>
> ---
> drivers/scsi/qla2xxx/qla_os.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> 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;
> }
> --
> 2.31.1
>

Looks Good.

Reviewed-by: Himanshu Madhani <[email protected]>

--
Himanshu Madhani Oracle Linux Engineering

2021-04-16 02:54:57

by Martin K. Petersen

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

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