All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH V2] dma: dw: switch from 'pci_' to 'dma_' API
@ 2021-09-28  3:43 Qing Wang
  2021-09-29  8:17 ` Andy Shevchenko
  0 siblings, 1 reply; 2+ messages in thread
From: Qing Wang @ 2021-09-28  3:43 UTC (permalink / raw)
  To: Viresh Kumar, Andy Shevchenko, 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()'.

Signed-off-by: Qing Wang <wangqing@vivo.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
 drivers/dma/dw/pci.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/dma/dw/pci.c b/drivers/dma/dw/pci.c
index 1142aa6..1dec1ae
--- a/drivers/dma/dw/pci.c
+++ b/drivers/dma/dw/pci.c
@@ -32,11 +32,7 @@ static int dw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *pid)
 	pci_set_master(pdev);
 	pci_try_set_mwi(pdev);
 
-	ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
-	if (ret)
-		return ret;
-
-	ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
+	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
 	if (ret)
 		return ret;
 
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH V2] dma: dw: switch from 'pci_' to 'dma_' API
  2021-09-28  3:43 [PATCH V2] dma: dw: switch from 'pci_' to 'dma_' API Qing Wang
@ 2021-09-29  8:17 ` Andy Shevchenko
  0 siblings, 0 replies; 2+ messages in thread
From: Andy Shevchenko @ 2021-09-29  8:17 UTC (permalink / raw)
  To: Qing Wang
  Cc: Viresh Kumar, Andy Shevchenko, Vinod Koul, dmaengine,
	Linux Kernel Mailing List

On Tue, Sep 28, 2021 at 6:44 AM Qing Wang <wangqing@vivo.com> 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)

I believe I have said to remove the noise from the commit message.

> While at it, some 'dma_set_mask()/dma_set_coherent_mask()' have been
> updated to a much less verbose 'dma_set_mask_and_coherent()'.

-- 
With Best Regards,
Andy Shevchenko

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-09-29  8:17 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-28  3:43 [PATCH V2] dma: dw: switch from 'pci_' to 'dma_' API Qing Wang
2021-09-29  8:17 ` Andy Shevchenko

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.