dmaengine: dw: switch from 'pci_' to 'dma_' API
authorQing Wang <wangqing@vivo.com>
Fri, 8 Oct 2021 03:28:31 +0000 (20:28 -0700)
committerVinod Koul <vkoul@kernel.org>
Tue, 26 Oct 2021 05:24:32 +0000 (10:54 +0530)
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: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/1633663733-47199-6-git-send-email-wangqing@vivo.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/dma/dw/pci.c

index 26a3f92..ad2d4d0 100644 (file)
@@ -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;