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

Commit 3c6c122c authored by Himanshu Jha's avatar Himanshu Jha Committed by Martin K. Petersen
Browse files

scsi: megaraid_sas: Use zeroing memory allocator than allocator/memset 



Use pci_zalloc_consistent for allocating zeroed memory and remove
unnecessary memset function.

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

Suggested-by: default avatarLuis R. Rodriguez <mcgrof@kernel.org>
Signed-off-by: default avatarHimanshu Jha <himanshujha199640@gmail.com>
Signed-off-by: default avatarShivasharan S <shivasharan.srikanteshwara@broadcom.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 6b1f8376

drivers/scsi/megaraid/megaraid_sas_base.c

+10 −15
Original line number Diff line number Diff line
@@ -2224,7 +2224,7 @@ static int megasas_get_ld_vf_affiliation_111(struct megasas_instance *instance, 
			       sizeof(struct MR_LD_VF_AFFILIATION_111));

	else {

		new_affiliation_111 =

			pci_alloc_consistent(instance->pdev,

			pci_zalloc_consistent(instance->pdev,

					      sizeof(struct MR_LD_VF_AFFILIATION_111),

					      &new_affiliation_111_h);

		if (!new_affiliation_111) {
@@ -2234,8 +2234,6 @@ static int megasas_get_ld_vf_affiliation_111(struct megasas_instance *instance, 
			megasas_return_cmd(instance, cmd);

			return -ENOMEM;

		}

		memset(new_affiliation_111, 0,

		       sizeof(struct MR_LD_VF_AFFILIATION_111));

	}



	memset(dcmd->mbox.b, 0, MFI_MBOX_SIZE);
@@ -2333,7 +2331,7 @@ static int megasas_get_ld_vf_affiliation_12(struct megasas_instance *instance, 
		       sizeof(struct MR_LD_VF_AFFILIATION));

	else {

		new_affiliation =

			pci_alloc_consistent(instance->pdev,

			pci_zalloc_consistent(instance->pdev,

					      (MAX_LOGICAL_DRIVES + 1) *

					      sizeof(struct MR_LD_VF_AFFILIATION),

					      &new_affiliation_h);
@@ -2344,8 +2342,6 @@ static int megasas_get_ld_vf_affiliation_12(struct megasas_instance *instance, 
			megasas_return_cmd(instance, cmd);

			return -ENOMEM;

		}

		memset(new_affiliation, 0, (MAX_LOGICAL_DRIVES + 1) *

		       sizeof(struct MR_LD_VF_AFFILIATION));

	}



	memset(dcmd->mbox.b, 0, MFI_MBOX_SIZE);
@@ -5636,7 +5632,7 @@ megasas_get_seq_num(struct megasas_instance *instance, 
	}



	dcmd = &cmd->frame->dcmd;

	el_info = pci_alloc_consistent(instance->pdev,

	el_info = pci_zalloc_consistent(instance->pdev,

					sizeof(struct megasas_evt_log_info),

					&el_info_h);
@@ -5645,7 +5641,6 @@ megasas_get_seq_num(struct megasas_instance *instance, 
		return -ENOMEM;

	}



	memset(el_info, 0, sizeof(*el_info));

	memset(dcmd->mbox.b, 0, MFI_MBOX_SIZE);



	dcmd->cmd = MFI_CMD_DCMD;

drivers/scsi/megaraid/megaraid_sas_fusion.c

+2 −3
Original line number Diff line number Diff line
@@ -684,7 +684,7 @@ megasas_alloc_rdpq_fusion(struct megasas_instance *instance) 
	array_size = sizeof(struct MPI2_IOC_INIT_RDPQ_ARRAY_ENTRY) *

		     MAX_MSIX_QUEUES_FUSION;



	fusion->rdpq_virt = pci_alloc_consistent(instance->pdev, array_size,

	fusion->rdpq_virt = pci_zalloc_consistent(instance->pdev, array_size,

						  &fusion->rdpq_phys);

	if (!fusion->rdpq_virt) {

		dev_err(&instance->pdev->dev,
@@ -692,7 +692,6 @@ megasas_alloc_rdpq_fusion(struct megasas_instance *instance) 
		return -ENOMEM;

	}



	memset(fusion->rdpq_virt, 0, array_size);

	msix_count = instance->msix_vectors > 0 ? instance->msix_vectors : 1;



	fusion->reply_frames_desc_pool = dma_pool_create("mr_rdpq",