| Message ID | 1611306174-92627-1-git-send-email-abaci-bugfix@linux.alibaba.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/2] scsi: qla2xxx: remove redundant NULL check | expand |
> On Jan 22, 2021, at 3:02 AM, Yang Li <abaci-bugfix@linux.alibaba.com> wrote: > > 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. > > Reported-by: Abaci Robot <abaci@linux.alibaba.com> > Signed-off-by: Yang Li <abaci-bugfix@linux.alibaba.com> > --- > drivers/scsi/qla2xxx/qla_init.c | 15 +++++---------- > 1 file changed, 5 insertions(+), 10 deletions(-) > > diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c > index dcc0f0d8..edd5dd1 100644 > --- a/drivers/scsi/qla2xxx/qla_init.c > +++ b/drivers/scsi/qla2xxx/qla_init.c > @@ -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; > > -- > 1.8.3.1 > Make Sense. Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com> -- Himanshu Madhani Oracle Linux Engineering
On Fri, 22 Jan 2021 17:02:53 +0800, Yang Li wrote: > 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. Applied to 5.12/scsi-queue, thanks! [1/2] scsi: qla2xxx: remove redundant NULL check https://git.kernel.org/mkp/scsi/c/18c05faf8ab1 -- Martin K. Petersen Oracle Linux Engineering
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index dcc0f0d8..edd5dd1 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -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;
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. Reported-by: Abaci Robot <abaci@linux.alibaba.com> Signed-off-by: Yang Li <abaci-bugfix@linux.alibaba.com> --- drivers/scsi/qla2xxx/qla_init.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)