p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

scsi: qla2xxx: Use zeroing allocator rather than allocator/memset 

Use dma_zalloc_coherent and vzalloc instead of dma_alloc_coherent and
vmalloc respectively, followed by memset 0.

Generated-by: scripts/coccinelle/api/alloc/kzalloc-simple.cocci

Suggested-by: Luis R. Rodriguez <mcgrof@kernel.org>
Signed-off-by: Himanshu Jha <himanshujha199640@gmail.com>
Acked-by: Himanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Himanshu Jha 2017-12-30 20:58:25 +05:30 committed by Martin K. Petersen
parent d103adb300
commit 0558312110
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/scsi/qla2xxx/qla_attr.c
View File

@ -1843,14 +1843,13 @@ qla2x00_get_fc_host_stats(struct Scsi_Host *shost)
if (qla2x00_reset_active(vha)) if (qla2x00_reset_active(vha))
goto done; goto done;
stats = dma_alloc_coherent(&ha->pdev->dev, stats = dma_zalloc_coherent(&ha->pdev->dev, sizeof(*stats),
sizeof(*stats), &stats_dma, GFP_KERNEL); &stats_dma, GFP_KERNEL);
if (!stats) { if (!stats) {
ql_log(ql_log_warn, vha, 0x707d, ql_log(ql_log_warn, vha, 0x707d,
"Failed to allocate memory for stats.\n"); "Failed to allocate memory for stats.\n");
goto done; goto done;
} }
memset(stats, 0, sizeof(*stats));
rval = QLA_FUNCTION_FAILED; rval = QLA_FUNCTION_FAILED;
if (IS_FWI2_CAPABLE(ha)) { if (IS_FWI2_CAPABLE(ha)) {

9
drivers/scsi/qla2xxx/qla_bsg.c
View File

@ -1435,7 +1435,7 @@ qla2x00_optrom_setup(struct bsg_job *bsg_job, scsi_qla_host_t *vha,
ha->optrom_state = QLA_SREADING; ha->optrom_state = QLA_SREADING;
} }
ha->optrom_buffer = vmalloc(ha->optrom_region_size); ha->optrom_buffer = vzalloc(ha->optrom_region_size);
if (!ha->optrom_buffer) { if (!ha->optrom_buffer) {
ql_log(ql_log_warn, vha, 0x7059, ql_log(ql_log_warn, vha, 0x7059,
"Read: Unable to allocate memory for optrom retrieval " "Read: Unable to allocate memory for optrom retrieval "
@ -1445,7 +1445,6 @@ qla2x00_optrom_setup(struct bsg_job *bsg_job, scsi_qla_host_t *vha,
return -ENOMEM; return -ENOMEM;
} }
memset(ha->optrom_buffer, 0, ha->optrom_region_size);
return 0; return 0;
} }
@ -2314,16 +2313,14 @@ qla2x00_get_priv_stats(struct bsg_job *bsg_job)
if (!IS_FWI2_CAPABLE(ha)) if (!IS_FWI2_CAPABLE(ha))
return -EPERM; return -EPERM;
stats = dma_alloc_coherent(&ha->pdev->dev, stats = dma_zalloc_coherent(&ha->pdev->dev, sizeof(*stats),
sizeof(*stats), &stats_dma, GFP_KERNEL); &stats_dma, GFP_KERNEL);
if (!stats) { if (!stats) {
ql_log(ql_log_warn, vha, 0x70e2, ql_log(ql_log_warn, vha, 0x70e2,
"Failed to allocate memory for stats.\n"); "Failed to allocate memory for stats.\n");
return -ENOMEM; return -ENOMEM;
} }
memset(stats, 0, sizeof(*stats));
rval = qla24xx_get_isp_stats(base_vha, stats, stats_dma, options); rval = qla24xx_get_isp_stats(base_vha, stats, stats_dma, options);
if (rval == QLA_SUCCESS) { if (rval == QLA_SUCCESS) {

5
drivers/scsi/qla2xxx/tcm_qla2xxx.c
View File

@ -1635,16 +1635,13 @@ static int tcm_qla2xxx_init_lport(struct tcm_qla2xxx_lport *lport)
return rc; return rc;
} }
lport->lport_loopid_map = vmalloc(sizeof(struct tcm_qla2xxx_fc_loopid) * lport->lport_loopid_map = vzalloc(sizeof(struct tcm_qla2xxx_fc_loopid) * 65536);
65536);
if (!lport->lport_loopid_map) { if (!lport->lport_loopid_map) {
pr_err("Unable to allocate lport->lport_loopid_map of %zu bytes\n", pr_err("Unable to allocate lport->lport_loopid_map of %zu bytes\n",
sizeof(struct tcm_qla2xxx_fc_loopid) * 65536); sizeof(struct tcm_qla2xxx_fc_loopid) * 65536);
btree_destroy32(&lport->lport_fcport_map); btree_destroy32(&lport->lport_fcport_map);
return -ENOMEM; return -ENOMEM;
} }
memset(lport->lport_loopid_map, 0, sizeof(struct tcm_qla2xxx_fc_loopid)
* 65536);
pr_debug("qla2xxx: Allocated lport_loopid_map of %zu bytes\n", pr_debug("qla2xxx: Allocated lport_loopid_map of %zu bytes\n",
sizeof(struct tcm_qla2xxx_fc_loopid) * 65536); sizeof(struct tcm_qla2xxx_fc_loopid) * 65536);
return 0; return 0;