| Message ID | 1514647712-6332-10-git-send-email-himanshujha199640@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On 30/12/17 8:58 PM, "Himanshu Jha" <himanshujha199640@gmail.com> wrote: >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> >--- > drivers/scsi/bnx2i/bnx2i_hwi.c | 14 ++++++-------- > 1 file changed, 6 insertions(+), 8 deletions(-) > >diff --git a/drivers/scsi/bnx2i/bnx2i_hwi.c >b/drivers/scsi/bnx2i/bnx2i_hwi.c >index 9e3bf53..c6a0bd6 100644 >--- a/drivers/scsi/bnx2i/bnx2i_hwi.c >+++ b/drivers/scsi/bnx2i/bnx2i_hwi.c >@@ -1069,16 +1069,15 @@ int bnx2i_alloc_qp_resc(struct bnx2i_hba *hba, >struct bnx2i_endpoint *ep) > } > > /* Allocate memory area for actual SQ element */ >- ep->qp.sq_virt = >- dma_alloc_coherent(&hba->pcidev->dev, ep->qp.sq_mem_size, >- &ep->qp.sq_phys, GFP_KERNEL); >+ ep->qp.sq_virt = >+ dma_zalloc_coherent(&hba->pcidev->dev, ep->qp.sq_mem_size, >+ &ep->qp.sq_phys, GFP_KERNEL); > if (!ep->qp.sq_virt) { > printk(KERN_ALERT "bnx2i: unable to alloc SQ BD memory %d\n", > ep->qp.sq_mem_size); > goto mem_alloc_err; > } > >- memset(ep->qp.sq_virt, 0x00, ep->qp.sq_mem_size); > ep->qp.sq_first_qe = ep->qp.sq_virt; > ep->qp.sq_prod_qe = ep->qp.sq_first_qe; > ep->qp.sq_cons_qe = ep->qp.sq_first_qe; >@@ -1106,15 +1105,14 @@ int bnx2i_alloc_qp_resc(struct bnx2i_hba *hba, >struct bnx2i_endpoint *ep) > } > > /* Allocate memory area for actual CQ element */ >- ep->qp.cq_virt = >- dma_alloc_coherent(&hba->pcidev->dev, ep->qp.cq_mem_size, >- &ep->qp.cq_phys, GFP_KERNEL); >+ ep->qp.cq_virt = >+ dma_zalloc_coherent(&hba->pcidev->dev, ep->qp.cq_mem_size, >+ &ep->qp.cq_phys, GFP_KERNEL); > if (!ep->qp.cq_virt) { > printk(KERN_ALERT "bnx2i: unable to alloc CQ BD memory %d\n", > ep->qp.cq_mem_size); > goto mem_alloc_err; > } >- memset(ep->qp.cq_virt, 0x00, ep->qp.cq_mem_size); > > ep->qp.cq_first_qe = ep->qp.cq_virt; > ep->qp.cq_prod_qe = ep->qp.cq_first_qe; >-- >2.7.4 Acked-by: Manish Rangankar <Manish.Rangankar@cavium.com> >
Himanshu, > Use dma_zalloc_coherent instead of dma_alloc_coherent followed by > memset 0. Applied to 4.16/scsi-queue.
diff --git a/drivers/scsi/bnx2i/bnx2i_hwi.c b/drivers/scsi/bnx2i/bnx2i_hwi.c index 9e3bf53..c6a0bd6 100644 --- a/drivers/scsi/bnx2i/bnx2i_hwi.c +++ b/drivers/scsi/bnx2i/bnx2i_hwi.c @@ -1069,16 +1069,15 @@ int bnx2i_alloc_qp_resc(struct bnx2i_hba *hba, struct bnx2i_endpoint *ep) } /* Allocate memory area for actual SQ element */ - ep->qp.sq_virt = - dma_alloc_coherent(&hba->pcidev->dev, ep->qp.sq_mem_size, - &ep->qp.sq_phys, GFP_KERNEL); + ep->qp.sq_virt = + dma_zalloc_coherent(&hba->pcidev->dev, ep->qp.sq_mem_size, + &ep->qp.sq_phys, GFP_KERNEL); if (!ep->qp.sq_virt) { printk(KERN_ALERT "bnx2i: unable to alloc SQ BD memory %d\n", ep->qp.sq_mem_size); goto mem_alloc_err; } - memset(ep->qp.sq_virt, 0x00, ep->qp.sq_mem_size); ep->qp.sq_first_qe = ep->qp.sq_virt; ep->qp.sq_prod_qe = ep->qp.sq_first_qe; ep->qp.sq_cons_qe = ep->qp.sq_first_qe; @@ -1106,15 +1105,14 @@ int bnx2i_alloc_qp_resc(struct bnx2i_hba *hba, struct bnx2i_endpoint *ep) } /* Allocate memory area for actual CQ element */ - ep->qp.cq_virt = - dma_alloc_coherent(&hba->pcidev->dev, ep->qp.cq_mem_size, - &ep->qp.cq_phys, GFP_KERNEL); + ep->qp.cq_virt = + dma_zalloc_coherent(&hba->pcidev->dev, ep->qp.cq_mem_size, + &ep->qp.cq_phys, GFP_KERNEL); if (!ep->qp.cq_virt) { printk(KERN_ALERT "bnx2i: unable to alloc CQ BD memory %d\n", ep->qp.cq_mem_size); goto mem_alloc_err; } - memset(ep->qp.cq_virt, 0x00, ep->qp.cq_mem_size); ep->qp.cq_first_qe = ep->qp.cq_virt; ep->qp.cq_prod_qe = ep->qp.cq_first_qe;
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> --- drivers/scsi/bnx2i/bnx2i_hwi.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)