| Message ID | 5bf1797b.1c69fb81.2368c.1ccc@mx.google.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | scsi/lpfc/lpfc_sli.c: Use dma_zalloc_coherent | expand |
On 18/11/2018 14:38, Sabyasachi Gupta wrote: > Replaced dma_alloc_coherent + memset with dma_zalloc_coherent > > Signed-off-by: Sabyasachi Gupta <sabyasachi.linux@gmail.com> > --- > drivers/scsi/lpfc/lpfc_sli.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c > index 783a154..3491ff7 100644 > --- a/drivers/scsi/lpfc/lpfc_sli.c > +++ b/drivers/scsi/lpfc/lpfc_sli.c > @@ -6229,7 +6229,7 @@ lpfc_sli4_ras_dma_alloc(struct lpfc_hba *phba, > goto free_mem; > } > > - dmabuf->virt = dma_alloc_coherent(&phba->pcidev->dev, > + dmabuf->virt = dma_zalloc_coherent(&phba->pcidev->dev, > LPFC_RAS_MAX_ENTRY_SIZE, please ensure that you maintain alignment with opening brackets > &dmabuf->phys, > GFP_KERNEL); > @@ -6240,7 +6240,6 @@ lpfc_sli4_ras_dma_alloc(struct lpfc_hba *phba, > "6187 DMA Alloc Failed FW logging"); > goto free_mem; > } > - memset(dmabuf->virt, 0, LPFC_RAS_MAX_ENTRY_SIZE); > dmabuf->buffer_tag = i; > list_add_tail(&dmabuf->list, &ras_fwlog->fwlog_buff_list); > } >
On 11/20/2018 1:40 AM, John Garry wrote: > > please ensure that you maintain alignment with opening brackets I don't think this is a requirement. From the rules I've read preference is tabs-only indentation. Spacing (less than a tab), after tabs, for open brace alignment is allowed, thus is coder's choice. -- james
On 11/18/2018 6:38 AM, Sabyasachi Gupta wrote: > Replaced dma_alloc_coherent + memset with dma_zalloc_coherent > > Signed-off-by: Sabyasachi Gupta <sabyasachi.linux@gmail.com> > --- > drivers/scsi/lpfc/lpfc_sli.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c > index 783a154..3491ff7 100644 > --- a/drivers/scsi/lpfc/lpfc_sli.c > +++ b/drivers/scsi/lpfc/lpfc_sli.c > @@ -6229,7 +6229,7 @@ lpfc_sli4_ras_dma_alloc(struct lpfc_hba *phba, > goto free_mem; > } > > - dmabuf->virt = dma_alloc_coherent(&phba->pcidev->dev, > + dmabuf->virt = dma_zalloc_coherent(&phba->pcidev->dev, > LPFC_RAS_MAX_ENTRY_SIZE, > &dmabuf->phys, > GFP_KERNEL); > @@ -6240,7 +6240,6 @@ lpfc_sli4_ras_dma_alloc(struct lpfc_hba *phba, > "6187 DMA Alloc Failed FW logging"); > goto free_mem; > } > - memset(dmabuf->virt, 0, LPFC_RAS_MAX_ENTRY_SIZE); > dmabuf->buffer_tag = i; > list_add_tail(&dmabuf->list, &ras_fwlog->fwlog_buff_list); > } Looks fine. -- james Reviewed-by: James Smart <jsmart2021@gmail.com>
On 20/11/2018 21:52, James Smart wrote: > On 11/20/2018 1:40 AM, John Garry wrote: >> >> please ensure that you maintain alignment with opening brackets > > I don't think this is a requirement. From the rules I've read > preference is tabs-only indentation. This is the only rule (enforcement) I see: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?h=next-20181120&id=d1fe9c099cecc6e49324355f1b15573e9dbbe0f9 Spacing (less than a tab), after > tabs, for open brace alignment is allowed, thus is coder's choice. It seems that alignment was being implemented with tab+space, and now it would be tab+space but no alignment. cheers, John > > -- james > > > > > > >
Sabyasachi,
> Replaced dma_alloc_coherent + memset with dma_zalloc_coherent
Applied to 4.21/scsi-queue. Thanks.
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c index 783a154..3491ff7 100644 --- a/drivers/scsi/lpfc/lpfc_sli.c +++ b/drivers/scsi/lpfc/lpfc_sli.c @@ -6229,7 +6229,7 @@ lpfc_sli4_ras_dma_alloc(struct lpfc_hba *phba, goto free_mem; } - dmabuf->virt = dma_alloc_coherent(&phba->pcidev->dev, + dmabuf->virt = dma_zalloc_coherent(&phba->pcidev->dev, LPFC_RAS_MAX_ENTRY_SIZE, &dmabuf->phys, GFP_KERNEL); @@ -6240,7 +6240,6 @@ lpfc_sli4_ras_dma_alloc(struct lpfc_hba *phba, "6187 DMA Alloc Failed FW logging"); goto free_mem; } - memset(dmabuf->virt, 0, LPFC_RAS_MAX_ENTRY_SIZE); dmabuf->buffer_tag = i; list_add_tail(&dmabuf->list, &ras_fwlog->fwlog_buff_list); }
Replaced dma_alloc_coherent + memset with dma_zalloc_coherent Signed-off-by: Sabyasachi Gupta <sabyasachi.linux@gmail.com> --- drivers/scsi/lpfc/lpfc_sli.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)