tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

block: use pci_zalloc_consistent

Remove the now unnecessary memset too.

Signed-off-by: Joe Perches <joe@perches.com>
Mike Miller <mike.miller@hp.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Joe Perches and committed by
Linus Torvalds a5bbf616 6f2a011a

+22 -32
+9 -9
drivers/block/DAC960.c
··· 6741 6741 ErrorCode = -ENOMEM; 6742 6742 if (DataTransferLength > 0) 6743 6743 { 6744 - DataTransferBuffer = pci_alloc_consistent(Controller->PCIDevice, 6745 - DataTransferLength, &DataTransferBufferDMA); 6744 + DataTransferBuffer = pci_zalloc_consistent(Controller->PCIDevice, 6745 + DataTransferLength, 6746 + &DataTransferBufferDMA); 6746 6747 if (DataTransferBuffer == NULL) 6747 6748 break; 6748 - memset(DataTransferBuffer, 0, DataTransferLength); 6749 6749 } 6750 6750 else if (DataTransferLength < 0) 6751 6751 { ··· 6877 6877 ErrorCode = -ENOMEM; 6878 6878 if (DataTransferLength > 0) 6879 6879 { 6880 - DataTransferBuffer = pci_alloc_consistent(Controller->PCIDevice, 6881 - DataTransferLength, &DataTransferBufferDMA); 6880 + DataTransferBuffer = pci_zalloc_consistent(Controller->PCIDevice, 6881 + DataTransferLength, 6882 + &DataTransferBufferDMA); 6882 6883 if (DataTransferBuffer == NULL) 6883 6884 break; 6884 - memset(DataTransferBuffer, 0, DataTransferLength); 6885 6885 } 6886 6886 else if (DataTransferLength < 0) 6887 6887 { ··· 6899 6899 RequestSenseLength = UserCommand.RequestSenseLength; 6900 6900 if (RequestSenseLength > 0) 6901 6901 { 6902 - RequestSenseBuffer = pci_alloc_consistent(Controller->PCIDevice, 6903 - RequestSenseLength, &RequestSenseBufferDMA); 6902 + RequestSenseBuffer = pci_zalloc_consistent(Controller->PCIDevice, 6903 + RequestSenseLength, 6904 + &RequestSenseBufferDMA); 6904 6905 if (RequestSenseBuffer == NULL) 6905 6906 { 6906 6907 ErrorCode = -ENOMEM; 6907 6908 goto Failure2; 6908 6909 } 6909 - memset(RequestSenseBuffer, 0, RequestSenseLength); 6910 6910 } 6911 6911 spin_lock_irqsave(&Controller->queue_lock, flags); 6912 6912 while ((Command = DAC960_AllocateCommand(Controller)) == NULL)
+4 -7
drivers/block/cciss.c
··· 1014 1014 u64bit temp64; 1015 1015 dma_addr_t cmd_dma_handle, err_dma_handle; 1016 1016 1017 - c = (CommandList_struct *) pci_alloc_consistent(h->pdev, 1018 - sizeof(CommandList_struct), &cmd_dma_handle); 1017 + c = pci_zalloc_consistent(h->pdev, sizeof(CommandList_struct), 1018 + &cmd_dma_handle); 1019 1019 if (c == NULL) 1020 1020 return NULL; 1021 - memset(c, 0, sizeof(CommandList_struct)); 1022 1021 1023 1022 c->cmdindex = -1; 1024 1023 1025 - c->err_info = (ErrorInfo_struct *) 1026 - pci_alloc_consistent(h->pdev, sizeof(ErrorInfo_struct), 1027 - &err_dma_handle); 1024 + c->err_info = pci_zalloc_consistent(h->pdev, sizeof(ErrorInfo_struct), 1025 + &err_dma_handle); 1028 1026 1029 1027 if (c->err_info == NULL) { 1030 1028 pci_free_consistent(h->pdev, 1031 1029 sizeof(CommandList_struct), c, cmd_dma_handle); 1032 1030 return NULL; 1033 1031 } 1034 - memset(c->err_info, 0, sizeof(ErrorInfo_struct)); 1035 1032 1036 1033 INIT_LIST_HEAD(&c->list); 1037 1034 c->busaddr = (__u32) cmd_dma_handle;
+9 -16
drivers/block/skd_main.c
··· 4112 4112 skdev->name, __func__, __LINE__, 4113 4113 nbytes, SKD_N_COMPLETION_ENTRY); 4114 4114 4115 - skcomp = pci_alloc_consistent(skdev->pdev, nbytes, 4116 - &skdev->cq_dma_address); 4115 + skcomp = pci_zalloc_consistent(skdev->pdev, nbytes, 4116 + &skdev->cq_dma_address); 4117 4117 4118 4118 if (skcomp == NULL) { 4119 4119 rc = -ENOMEM; 4120 4120 goto err_out; 4121 4121 } 4122 - 4123 - memset(skcomp, 0, nbytes); 4124 4122 4125 4123 skdev->skcomp_table = skcomp; 4126 4124 skdev->skerr_table = (struct fit_comp_error_info *)((char *)skcomp + ··· 4302 4304 4303 4305 nbytes = SKD_N_SPECIAL_FITMSG_BYTES; 4304 4306 4305 - skspcl->msg_buf = pci_alloc_consistent(skdev->pdev, nbytes, 4306 - &skspcl->mb_dma_address); 4307 + skspcl->msg_buf = 4308 + pci_zalloc_consistent(skdev->pdev, nbytes, 4309 + &skspcl->mb_dma_address); 4307 4310 if (skspcl->msg_buf == NULL) { 4308 4311 rc = -ENOMEM; 4309 4312 goto err_out; 4310 4313 } 4311 - 4312 - memset(skspcl->msg_buf, 0, nbytes); 4313 4314 4314 4315 skspcl->req.sg = kzalloc(sizeof(struct scatterlist) * 4315 4316 SKD_N_SG_PER_SPECIAL, GFP_KERNEL); ··· 4350 4353 4351 4354 nbytes = SKD_N_INTERNAL_BYTES; 4352 4355 4353 - skspcl->data_buf = pci_alloc_consistent(skdev->pdev, nbytes, 4354 - &skspcl->db_dma_address); 4356 + skspcl->data_buf = pci_zalloc_consistent(skdev->pdev, nbytes, 4357 + &skspcl->db_dma_address); 4355 4358 if (skspcl->data_buf == NULL) { 4356 4359 rc = -ENOMEM; 4357 4360 goto err_out; 4358 4361 } 4359 4362 4360 - memset(skspcl->data_buf, 0, nbytes); 4361 - 4362 4363 nbytes = SKD_N_SPECIAL_FITMSG_BYTES; 4363 - skspcl->msg_buf = pci_alloc_consistent(skdev->pdev, nbytes, 4364 - &skspcl->mb_dma_address); 4364 + skspcl->msg_buf = pci_zalloc_consistent(skdev->pdev, nbytes, 4365 + &skspcl->mb_dma_address); 4365 4366 if (skspcl->msg_buf == NULL) { 4366 4367 rc = -ENOMEM; 4367 4368 goto err_out; 4368 4369 } 4369 - 4370 - memset(skspcl->msg_buf, 0, nbytes); 4371 4370 4372 4371 skspcl->req.sksg_list = skd_cons_sg_list(skdev, 1, 4373 4372 &skspcl->req.sksg_dma_address);