summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorQing Wang <wangqing@vivo.com>2021-10-07 20:28:31 -0700
committerVinod Koul <vkoul@kernel.org>2021-10-26 10:54:32 +0530
commit1365e117bf5eca14c7397c404770ffbc5e3ad99c (patch)
tree23929ca0aed95174d35023b6d150f7be8711f495 /drivers
parentecb8c88bd31cce374396358f395795dcfe3479f8 (diff)
downloadlinux-stable-1365e117bf5eca14c7397c404770ffbc5e3ad99c.tar.gz
linux-stable-1365e117bf5eca14c7397c404770ffbc5e3ad99c.tar.bz2
linux-stable-1365e117bf5eca14c7397c404770ffbc5e3ad99c.zip
dmaengine: dw: 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: 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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/dma/dw/pci.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/dma/dw/pci.c b/drivers/dma/dw/pci.c
index 26a3f926da02..ad2d4d012cf7 100644
--- 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;