Commit a5bbf616 authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

block: use pci_zalloc_consistent 



Remove the now unnecessary memset too.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Mike Miller <mike.miller@hp.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6f2a011a

drivers/block/DAC960.c

+9 −9
Original line number Diff line number Diff line
@@ -6741,11 +6741,11 @@ static long DAC960_gam_ioctl(struct file *file, unsigned int Request, 
	ErrorCode = -ENOMEM;

	if (DataTransferLength > 0)

	  {

	    DataTransferBuffer = pci_alloc_consistent(Controller->PCIDevice,

				DataTransferLength, &DataTransferBufferDMA);

	    DataTransferBuffer = pci_zalloc_consistent(Controller->PCIDevice,

                                                       DataTransferLength,

                                                       &DataTransferBufferDMA);

	    if (DataTransferBuffer == NULL)

	    	break;

	    memset(DataTransferBuffer, 0, DataTransferLength);

	  }

	else if (DataTransferLength < 0)

	  {
@@ -6877,11 +6877,11 @@ static long DAC960_gam_ioctl(struct file *file, unsigned int Request, 
    	ErrorCode = -ENOMEM;

	if (DataTransferLength > 0)

	  {

	    DataTransferBuffer = pci_alloc_consistent(Controller->PCIDevice,

				DataTransferLength, &DataTransferBufferDMA);

	    DataTransferBuffer = pci_zalloc_consistent(Controller->PCIDevice,

                                                       DataTransferLength,

                                                       &DataTransferBufferDMA);

	    if (DataTransferBuffer == NULL)

	    	break;

	    memset(DataTransferBuffer, 0, DataTransferLength);

	  }

	else if (DataTransferLength < 0)

	  {
@@ -6899,14 +6899,14 @@ static long DAC960_gam_ioctl(struct file *file, unsigned int Request, 
	RequestSenseLength = UserCommand.RequestSenseLength;

	if (RequestSenseLength > 0)

	  {

	    RequestSenseBuffer = pci_alloc_consistent(Controller->PCIDevice,

			RequestSenseLength, &RequestSenseBufferDMA);

	    RequestSenseBuffer = pci_zalloc_consistent(Controller->PCIDevice,

                                                       RequestSenseLength,

                                                       &RequestSenseBufferDMA);

	    if (RequestSenseBuffer == NULL)

	      {

		ErrorCode = -ENOMEM;

		goto Failure2;

	      }

	    memset(RequestSenseBuffer, 0, RequestSenseLength);

	  }

	spin_lock_irqsave(&Controller->queue_lock, flags);

	while ((Command = DAC960_AllocateCommand(Controller)) == NULL)

drivers/block/cciss.c

+4 −7
Original line number Diff line number Diff line
@@ -1014,16 +1014,14 @@ static CommandList_struct *cmd_special_alloc(ctlr_info_t *h) 
	u64bit temp64;

	dma_addr_t cmd_dma_handle, err_dma_handle;



	c = (CommandList_struct *) pci_alloc_consistent(h->pdev,

		sizeof(CommandList_struct), &cmd_dma_handle);

	c = pci_zalloc_consistent(h->pdev, sizeof(CommandList_struct),

				  &cmd_dma_handle);

	if (c == NULL)

		return NULL;

	memset(c, 0, sizeof(CommandList_struct));



	c->cmdindex = -1;



	c->err_info = (ErrorInfo_struct *)

	    pci_alloc_consistent(h->pdev, sizeof(ErrorInfo_struct),

	c->err_info = pci_zalloc_consistent(h->pdev, sizeof(ErrorInfo_struct),

					    &err_dma_handle);



	if (c->err_info == NULL) {
@@ -1031,7 +1029,6 @@ static CommandList_struct *cmd_special_alloc(ctlr_info_t *h) 
			sizeof(CommandList_struct), c, cmd_dma_handle);

		return NULL;

	}

	memset(c->err_info, 0, sizeof(ErrorInfo_struct));



	INIT_LIST_HEAD(&c->list);

	c->busaddr = (__u32) cmd_dma_handle;

drivers/block/skd_main.c

+9 −16
Original line number Diff line number Diff line
@@ -4112,7 +4112,7 @@ static int skd_cons_skcomp(struct skd_device *skdev) 
		 skdev->name, __func__, __LINE__,

		 nbytes, SKD_N_COMPLETION_ENTRY);



	skcomp = pci_alloc_consistent(skdev->pdev, nbytes,

	skcomp = pci_zalloc_consistent(skdev->pdev, nbytes,

				       &skdev->cq_dma_address);



	if (skcomp == NULL) {
@@ -4120,8 +4120,6 @@ static int skd_cons_skcomp(struct skd_device *skdev) 
		goto err_out;

	}



	memset(skcomp, 0, nbytes);



	skdev->skcomp_table = skcomp;

	skdev->skerr_table = (struct fit_comp_error_info *)((char *)skcomp +

							   sizeof(*skcomp) *
@@ -4304,15 +4302,14 @@ static int skd_cons_skspcl(struct skd_device *skdev) 


		nbytes = SKD_N_SPECIAL_FITMSG_BYTES;



		skspcl->msg_buf = pci_alloc_consistent(skdev->pdev, nbytes,

		skspcl->msg_buf =

			pci_zalloc_consistent(skdev->pdev, nbytes,

					      &skspcl->mb_dma_address);

		if (skspcl->msg_buf == NULL) {

			rc = -ENOMEM;

			goto err_out;

		}



		memset(skspcl->msg_buf, 0, nbytes);



		skspcl->req.sg = kzalloc(sizeof(struct scatterlist) *

					 SKD_N_SG_PER_SPECIAL, GFP_KERNEL);

		if (skspcl->req.sg == NULL) {
@@ -4353,25 +4350,21 @@ static int skd_cons_sksb(struct skd_device *skdev) 


	nbytes = SKD_N_INTERNAL_BYTES;



	skspcl->data_buf = pci_alloc_consistent(skdev->pdev, nbytes,

	skspcl->data_buf = pci_zalloc_consistent(skdev->pdev, nbytes,

						 &skspcl->db_dma_address);

	if (skspcl->data_buf == NULL) {

		rc = -ENOMEM;

		goto err_out;

	}



	memset(skspcl->data_buf, 0, nbytes);



	nbytes = SKD_N_SPECIAL_FITMSG_BYTES;

	skspcl->msg_buf = pci_alloc_consistent(skdev->pdev, nbytes,

	skspcl->msg_buf = pci_zalloc_consistent(skdev->pdev, nbytes,

						&skspcl->mb_dma_address);

	if (skspcl->msg_buf == NULL) {

		rc = -ENOMEM;

		goto err_out;

	}



	memset(skspcl->msg_buf, 0, nbytes);



	skspcl->req.sksg_list = skd_cons_sg_list(skdev, 1,

						 &skspcl->req.sksg_dma_address);

	if (skspcl->req.sksg_list == NULL) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE