hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Use dma_zalloc_coherent instead of dma_alloc_coherent 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: Manish Rangankar <Manish.Rangankar@cavium.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Himanshu Jha 2017-12-30 20:58:24 +05:30 committed by Martin K. Petersen
parent bef4e68830
commit d103adb300
4 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/scsi/qla4xxx/ql4_init.c
View File

@ -153,15 +153,14 @@ int qla4xxx_get_sys_info(struct scsi_qla_host *ha)
dma_addr_t sys_info_dma; dma_addr_t sys_info_dma;
int status = QLA_ERROR; int status = QLA_ERROR;
sys_info = dma_alloc_coherent(&ha->pdev->dev, sizeof(*sys_info), sys_info = dma_zalloc_coherent(&ha->pdev->dev, sizeof(*sys_info),
&sys_info_dma, GFP_KERNEL); &sys_info_dma, GFP_KERNEL);
if (sys_info == NULL) { if (sys_info == NULL) {
DEBUG2(printk("scsi%ld: %s: Unable to allocate dma buffer.\n", DEBUG2(printk("scsi%ld: %s: Unable to allocate dma buffer.\n",
ha->host_no, __func__)); ha->host_no, __func__));
goto exit_get_sys_info_no_free; goto exit_get_sys_info_no_free;
} }
memset(sys_info, 0, sizeof(*sys_info));
/* Get flash sys info */ /* Get flash sys info */
if (qla4xxx_get_flash(ha, sys_info_dma, FLASH_OFFSET_SYS_INFO, if (qla4xxx_get_flash(ha, sys_info_dma, FLASH_OFFSET_SYS_INFO,

21
drivers/scsi/qla4xxx/ql4_mbx.c
View File

@ -625,15 +625,14 @@ int qla4xxx_initialize_fw_cb(struct scsi_qla_host * ha)
uint32_t mbox_sts[MBOX_REG_COUNT]; uint32_t mbox_sts[MBOX_REG_COUNT];
int status = QLA_ERROR; int status = QLA_ERROR;
init_fw_cb = dma_alloc_coherent(&ha->pdev->dev, init_fw_cb = dma_zalloc_coherent(&ha->pdev->dev,
sizeof(struct addr_ctrl_blk), sizeof(struct addr_ctrl_blk),
&init_fw_cb_dma, GFP_KERNEL); &init_fw_cb_dma, GFP_KERNEL);
if (init_fw_cb == NULL) { if (init_fw_cb == NULL) {
DEBUG2(printk("scsi%ld: %s: Unable to alloc init_cb\n", DEBUG2(printk("scsi%ld: %s: Unable to alloc init_cb\n",
ha->host_no, __func__)); ha->host_no, __func__));
goto exit_init_fw_cb_no_free; goto exit_init_fw_cb_no_free;
} }
memset(init_fw_cb, 0, sizeof(struct addr_ctrl_blk));
/* Get Initialize Firmware Control Block. */ /* Get Initialize Firmware Control Block. */
memset(&mbox_cmd, 0, sizeof(mbox_cmd)); memset(&mbox_cmd, 0, sizeof(mbox_cmd));
@ -710,9 +709,9 @@ int qla4xxx_get_dhcp_ip_address(struct scsi_qla_host * ha)
uint32_t mbox_cmd[MBOX_REG_COUNT]; uint32_t mbox_cmd[MBOX_REG_COUNT];
uint32_t mbox_sts[MBOX_REG_COUNT]; uint32_t mbox_sts[MBOX_REG_COUNT];
init_fw_cb = dma_alloc_coherent(&ha->pdev->dev, init_fw_cb = dma_zalloc_coherent(&ha->pdev->dev,
sizeof(struct addr_ctrl_blk), sizeof(struct addr_ctrl_blk),
&init_fw_cb_dma, GFP_KERNEL); &init_fw_cb_dma, GFP_KERNEL);
if (init_fw_cb == NULL) { if (init_fw_cb == NULL) {
printk("scsi%ld: %s: Unable to alloc init_cb\n", ha->host_no, printk("scsi%ld: %s: Unable to alloc init_cb\n", ha->host_no,
__func__); __func__);
@ -720,7 +719,6 @@ int qla4xxx_get_dhcp_ip_address(struct scsi_qla_host * ha)
} }
/* Get Initialize Firmware Control Block. */ /* Get Initialize Firmware Control Block. */
memset(init_fw_cb, 0, sizeof(struct addr_ctrl_blk));
if (qla4xxx_get_ifcb(ha, &mbox_cmd[0], &mbox_sts[0], init_fw_cb_dma) != if (qla4xxx_get_ifcb(ha, &mbox_cmd[0], &mbox_sts[0], init_fw_cb_dma) !=
QLA_SUCCESS) { QLA_SUCCESS) {
DEBUG2(printk("scsi%ld: %s: Failed to get init_fw_ctrl_blk\n", DEBUG2(printk("scsi%ld: %s: Failed to get init_fw_ctrl_blk\n",
@ -1342,16 +1340,15 @@ int qla4xxx_about_firmware(struct scsi_qla_host *ha)
uint32_t mbox_sts[MBOX_REG_COUNT]; uint32_t mbox_sts[MBOX_REG_COUNT];
int status = QLA_ERROR; int status = QLA_ERROR;
about_fw = dma_alloc_coherent(&ha->pdev->dev, about_fw = dma_zalloc_coherent(&ha->pdev->dev,
sizeof(struct about_fw_info), sizeof(struct about_fw_info),
&about_fw_dma, GFP_KERNEL); &about_fw_dma, GFP_KERNEL);
if (!about_fw) { if (!about_fw) {
DEBUG2(ql4_printk(KERN_ERR, ha, "%s: Unable to alloc memory " DEBUG2(ql4_printk(KERN_ERR, ha, "%s: Unable to alloc memory "
"for about_fw\n", __func__)); "for about_fw\n", __func__));
return status; return status;
} }
memset(about_fw, 0, sizeof(struct about_fw_info));
memset(&mbox_cmd, 0, sizeof(mbox_cmd)); memset(&mbox_cmd, 0, sizeof(mbox_cmd));
memset(&mbox_sts, 0, sizeof(mbox_sts)); memset(&mbox_sts, 0, sizeof(mbox_sts));

5
drivers/scsi/qla4xxx/ql4_nx.c
View File

@ -4050,15 +4050,14 @@ int qla4_8xxx_get_sys_info(struct scsi_qla_host *ha)
dma_addr_t sys_info_dma; dma_addr_t sys_info_dma;
int status = QLA_ERROR; int status = QLA_ERROR;
sys_info = dma_alloc_coherent(&ha->pdev->dev, sizeof(*sys_info), sys_info = dma_zalloc_coherent(&ha->pdev->dev, sizeof(*sys_info),
&sys_info_dma, GFP_KERNEL); &sys_info_dma, GFP_KERNEL);
if (sys_info == NULL) { if (sys_info == NULL) {
DEBUG2(printk("scsi%ld: %s: Unable to allocate dma buffer.\n", DEBUG2(printk("scsi%ld: %s: Unable to allocate dma buffer.\n",
ha->host_no, __func__)); ha->host_no, __func__));
return status; return status;
} }
memset(sys_info, 0, sizeof(*sys_info));
memset(&mbox_cmd, 0, sizeof(mbox_cmd)); memset(&mbox_cmd, 0, sizeof(mbox_cmd));
memset(&mbox_sts, 0, sizeof(mbox_sts)); memset(&mbox_sts, 0, sizeof(mbox_sts));

12
drivers/scsi/qla4xxx/ql4_os.c
View File

@ -2689,16 +2689,15 @@ qla4xxx_iface_set_param(struct Scsi_Host *shost, void *data, uint32_t len)
uint32_t rem = len; uint32_t rem = len;
struct nlattr *attr; struct nlattr *attr;
init_fw_cb = dma_alloc_coherent(&ha->pdev->dev, init_fw_cb = dma_zalloc_coherent(&ha->pdev->dev,
sizeof(struct addr_ctrl_blk), sizeof(struct addr_ctrl_blk),
&init_fw_cb_dma, GFP_KERNEL); &init_fw_cb_dma, GFP_KERNEL);
if (!init_fw_cb) { if (!init_fw_cb) {
ql4_printk(KERN_ERR, ha, "%s: Unable to alloc init_cb\n", ql4_printk(KERN_ERR, ha, "%s: Unable to alloc init_cb\n",
__func__); __func__);
return -ENOMEM; return -ENOMEM;
} }
memset(init_fw_cb, 0, sizeof(struct addr_ctrl_blk));
memset(&mbox_cmd, 0, sizeof(mbox_cmd)); memset(&mbox_cmd, 0, sizeof(mbox_cmd));
memset(&mbox_sts, 0, sizeof(mbox_sts)); memset(&mbox_sts, 0, sizeof(mbox_sts));
@ -4196,15 +4195,14 @@ static int qla4xxx_mem_alloc(struct scsi_qla_host *ha)
sizeof(struct shadow_regs) + sizeof(struct shadow_regs) +
MEM_ALIGN_VALUE + MEM_ALIGN_VALUE +
(PAGE_SIZE - 1)) & ~(PAGE_SIZE - 1); (PAGE_SIZE - 1)) & ~(PAGE_SIZE - 1);
ha->queues = dma_alloc_coherent(&ha->pdev->dev, ha->queues_len, ha->queues = dma_zalloc_coherent(&ha->pdev->dev, ha->queues_len,
&ha->queues_dma, GFP_KERNEL); &ha->queues_dma, GFP_KERNEL);
if (ha->queues == NULL) { if (ha->queues == NULL) {
ql4_printk(KERN_WARNING, ha, ql4_printk(KERN_WARNING, ha,
"Memory Allocation failed - queues.\n"); "Memory Allocation failed - queues.\n");
goto mem_alloc_error_exit; goto mem_alloc_error_exit;
} }
memset(ha->queues, 0, ha->queues_len);
/* /*
* As per RISC alignment requirements -- the bus-address must be a * As per RISC alignment requirements -- the bus-address must be a