* [PATCH] dma: plx_dma: switch from 'pci_' to 'dma_' API
@ 2021-09-17 7:18 Qing Wang
2021-09-17 15:20 ` Logan Gunthorpe
0 siblings, 1 reply; 2+ messages in thread
From: Qing Wang @ 2021-09-17 7:18 UTC (permalink / raw)
To: Logan Gunthorpe, Vinod Koul, dmaengine, linux-kernel; +Cc: Qing Wang
The wrappers in include/linux/pci-dma-compat.h should go away.
The patch has been generated with the coccinelle script below.
expression e1, e2;
@@
- pci_set_dma_mask(e1, e2)
+ dma_set_mask(&e1->dev, e2)
@@
expression e1, e2;
@@
- pci_set_consistent_dma_mask(e1, e2)
+ dma_set_coherent_mask(&e1->dev, e2)
While at it, some 'dma_set_mask()/dma_set_coherent_mask()' have been
updated to a much less verbose 'dma_set_mask_and_coherent()'.
This type of patches has been going on for a long time, I plan to
clean it up in the near future. If needed, see post from
Christoph Hellwig on the kernel-janitors ML:
https://marc.info/?l=kernel-janitors&m=158745678307186&w=4
Signed-off-by: Qing Wang <wangqing@vivo.com>
---
drivers/dma/plx_dma.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/dma/plx_dma.c b/drivers/dma/plx_dma.c
index 1669345..1ffcb5c
--- a/drivers/dma/plx_dma.c
+++ b/drivers/dma/plx_dma.c
@@ -563,15 +563,9 @@ static int plx_dma_probe(struct pci_dev *pdev,
if (rc)
return rc;
- rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(48));
+ rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48));
if (rc)
- rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
- if (rc)
- return rc;
-
- rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(48));
- if (rc)
- rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
+ rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
if (rc)
return rc;
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] dma: plx_dma: switch from 'pci_' to 'dma_' API
2021-09-17 7:18 [PATCH] dma: plx_dma: switch from 'pci_' to 'dma_' API Qing Wang
@ 2021-09-17 15:20 ` Logan Gunthorpe
0 siblings, 0 replies; 2+ messages in thread
From: Logan Gunthorpe @ 2021-09-17 15:20 UTC (permalink / raw)
To: Qing Wang, Vinod Koul, dmaengine, linux-kernel
On 2021-09-17 1:18 a.m., Qing Wang wrote:
> The wrappers in include/linux/pci-dma-compat.h should go away.
>
> The patch has been generated with the coccinelle script below.
> expression e1, e2;
> @@
> - pci_set_dma_mask(e1, e2)
> + dma_set_mask(&e1->dev, e2)
>
> @@
> expression e1, e2;
> @@
> - pci_set_consistent_dma_mask(e1, e2)
> + dma_set_coherent_mask(&e1->dev, e2)
>
> While at it, some 'dma_set_mask()/dma_set_coherent_mask()' have been
> updated to a much less verbose 'dma_set_mask_and_coherent()'.
>
> This type of patches has been going on for a long time, I plan to
> clean it up in the near future. If needed, see post from
> Christoph Hellwig on the kernel-janitors ML:
> https://marc.info/?l=kernel-janitors&m=158745678307186&w=4
>
> Signed-off-by: Qing Wang <wangqing@vivo.com>
Looks good to me. Thanks.
Reviweed-by: Logan Gunthorpe <logang@deltatee.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-09-17 15:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-17 7:18 [PATCH] dma: plx_dma: switch from 'pci_' to 'dma_' API Qing Wang
2021-09-17 15:20 ` Logan Gunthorpe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).