lkml.org 
[lkml]   [2014]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 03/22] block: Use pci_zalloc_consistent
    Date
    Remove the now unnecessary memset too.

    Signed-off-by: Joe Perches <joe@perches.com>
    ---
    drivers/block/DAC960.c | 18 +++++++++---------
    drivers/block/cciss.c | 11 ++++-------
    drivers/block/skd_main.c | 25 +++++++++----------------
    3 files changed, 22 insertions(+), 32 deletions(-)

    diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
    index 125d845..811e11c 100644
    --- a/drivers/block/DAC960.c
    +++ b/drivers/block/DAC960.c
    @@ -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)
    diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
    index 4595c22..ff20f19 100644
    --- a/drivers/block/cciss.c
    +++ b/drivers/block/cciss.c
    @@ -1014,24 +1014,21 @@ 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),
    - &err_dma_handle);
    + c->err_info = pci_zalloc_consistent(h->pdev, sizeof(ErrorInfo_struct),
    + &err_dma_handle);

    if (c->err_info == NULL) {
    pci_free_consistent(h->pdev,
    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;
    diff --git a/drivers/block/skd_main.c b/drivers/block/skd_main.c
    index 608532d..f0a089d 100644
    --- a/drivers/block/skd_main.c
    +++ b/drivers/block/skd_main.c
    @@ -4112,16 +4112,14 @@ 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,
    - &skdev->cq_dma_address);
    + skcomp = pci_zalloc_consistent(skdev->pdev, nbytes,
    + &skdev->cq_dma_address);

    if (skcomp == NULL) {
    rc = -ENOMEM;
    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->mb_dma_address);
    + 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->db_dma_address);
    + 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->mb_dma_address);
    + 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) {
    --
    1.8.1.2.459.gbcd45b4.dirty


    \
     
     \ /
      Last update: 2014-06-23 16:41    [W:3.421 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site