dmaengine: switch from 'pci_' to 'dma_' API

The wrappers in include/linux/pci-dma-compat.h should go away.

pci_set_dma_mask()/pci_set_consistent_dma_mask() should be
replaced with dma_set_mask()/dma_set_coherent_mask(),
and use dma_set_mask_and_coherent() for both.

Signed-off-by: Qing Wang <wangqing@vivo.com>
Reviewed-by: Logan Gunthorpe <logang@deltatee.com>
Link: https://lore.kernel.org/r/1633663733-47199-7-git-send-email-wangqing@vivo.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/dma/plx_dma.c b/drivers/dma/plx_dma.c
index 1669345441619edf81e546146f3de40f6470e6ba..1ffcb5ca97884b7037bf93cdf09a66087746e14f 100644 (file)
--- 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;