Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d103adb3 authored Dec 30, 2017 by Himanshu Jha Committed by Martin K. Petersen Jan 04, 2018

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>

parent bef4e688

drivers/scsi/qla4xxx/ql4_init.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -153,7 +153,7 @@ int qla4xxx_get_sys_info(struct scsi_qla_host *ha)
		dma_addr_t sys_info_dma;
		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);
		if (sys_info == NULL) {
		DEBUG2(printk("scsi%ld: %s: Unable to allocate dma buffer.\n",
		@@ -161,7 +161,6 @@ int qla4xxx_get_sys_info(struct scsi_qla_host *ha)

		goto exit_get_sys_info_no_free;
		}
		memset(sys_info, 0, sizeof(*sys_info));

		/* Get flash sys info */
		if (qla4xxx_get_flash(ha, sys_info_dma, FLASH_OFFSET_SYS_INFO,

drivers/scsi/qla4xxx/ql4_mbx.c

+9 −12

Original line number	Diff line number	Diff line
		@@ -625,7 +625,7 @@ int qla4xxx_initialize_fw_cb(struct scsi_qla_host * ha)
		uint32_t mbox_sts[MBOX_REG_COUNT];
		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),
		&init_fw_cb_dma, GFP_KERNEL);
		if (init_fw_cb == NULL) {
		@@ -633,7 +633,6 @@ int qla4xxx_initialize_fw_cb(struct scsi_qla_host * ha)
		ha->host_no, __func__));
		goto exit_init_fw_cb_no_free;
		}
		memset(init_fw_cb, 0, sizeof(struct addr_ctrl_blk));

		/* Get Initialize Firmware Control Block. */
		memset(&mbox_cmd, 0, sizeof(mbox_cmd));
		@@ -710,7 +709,7 @@ int qla4xxx_get_dhcp_ip_address(struct scsi_qla_host * ha)
		uint32_t mbox_cmd[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),
		&init_fw_cb_dma, GFP_KERNEL);
		if (init_fw_cb == NULL) {
		@@ -720,7 +719,6 @@ int qla4xxx_get_dhcp_ip_address(struct scsi_qla_host * ha)
		}

		/* 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) !=
		QLA_SUCCESS) {
		DEBUG2(printk("scsi%ld: %s: Failed to get init_fw_ctrl_blk\n",
		@@ -1342,7 +1340,7 @@ int qla4xxx_about_firmware(struct scsi_qla_host *ha)
		uint32_t mbox_sts[MBOX_REG_COUNT];
		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),
		&about_fw_dma, GFP_KERNEL);
		if (!about_fw) {
		@@ -1351,7 +1349,6 @@ int qla4xxx_about_firmware(struct scsi_qla_host *ha)
		return status;
		}

		memset(about_fw, 0, sizeof(struct about_fw_info));
		memset(&mbox_cmd, 0, sizeof(mbox_cmd));
		memset(&mbox_sts, 0, sizeof(mbox_sts));

drivers/scsi/qla4xxx/ql4_nx.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -4050,7 +4050,7 @@ int qla4_8xxx_get_sys_info(struct scsi_qla_host *ha)
		dma_addr_t sys_info_dma;
		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);
		if (sys_info == NULL) {
		DEBUG2(printk("scsi%ld: %s: Unable to allocate dma buffer.\n",
		@@ -4058,7 +4058,6 @@ int qla4_8xxx_get_sys_info(struct scsi_qla_host *ha)
		return status;
		}

		memset(sys_info, 0, sizeof(*sys_info));
		memset(&mbox_cmd, 0, sizeof(mbox_cmd));
		memset(&mbox_sts, 0, sizeof(mbox_sts));

drivers/scsi/qla4xxx/ql4_os.c

+5 −7

Original line number	Diff line number	Diff line
		@@ -2689,7 +2689,7 @@ qla4xxx_iface_set_param(struct Scsi_Host shost, void data, uint32_t len)
		uint32_t rem = len;
		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),
		&init_fw_cb_dma, GFP_KERNEL);
		if (!init_fw_cb) {
		@@ -2698,7 +2698,6 @@ qla4xxx_iface_set_param(struct Scsi_Host shost, void data, uint32_t len)
		return -ENOMEM;
		}

		memset(init_fw_cb, 0, sizeof(struct addr_ctrl_blk));
		memset(&mbox_cmd, 0, sizeof(mbox_cmd));
		memset(&mbox_sts, 0, sizeof(mbox_sts));

		@@ -4196,7 +4195,7 @@ static int qla4xxx_mem_alloc(struct scsi_qla_host *ha)
		sizeof(struct shadow_regs) +
		MEM_ALIGN_VALUE +
		(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);
		if (ha->queues == NULL) {
		ql4_printk(KERN_WARNING, ha,
		@@ -4204,7 +4203,6 @@ static int qla4xxx_mem_alloc(struct scsi_qla_host *ha)

		goto mem_alloc_error_exit;
		}
		memset(ha->queues, 0, ha->queues_len);

		/*
		* As per RISC alignment requirements -- the bus-address must be a