diff options
author | Qing Wang <wangqing@vivo.com> | 2021-10-07 20:28:28 -0700 |
---|---|---|
committer | Vinod Koul <vkoul@kernel.org> | 2021-10-26 10:54:53 +0530 |
commit | 0c5afef7bf1fbda7e7883dc4b93f64f90003706f (patch) | |
tree | 4b25dc8bced7088415609e3884c73bcf1f371b3d /drivers/dma | |
parent | bec897e0a796e3eb5116a2340505ca2da4cecb1b (diff) | |
download | linux-0c5afef7bf1fbda7e7883dc4b93f64f90003706f.tar.gz linux-0c5afef7bf1fbda7e7883dc4b93f64f90003706f.tar.bz2 linux-0c5afef7bf1fbda7e7883dc4b93f64f90003706f.zip |
dmaengine: ioat: 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>
Link: https://lore.kernel.org/r/1633663733-47199-3-git-send-email-wangqing@vivo.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Diffstat (limited to 'drivers/dma')
-rw-r--r-- | drivers/dma/ioat/init.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/dma/ioat/init.c b/drivers/dma/ioat/init.c index 191b59279007..373b8dac6c9b 100644 --- a/drivers/dma/ioat/init.c +++ b/drivers/dma/ioat/init.c @@ -1363,15 +1363,9 @@ static int ioat_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) if (!iomap) return -ENOMEM; - err = pci_set_dma_mask(pdev, DMA_BIT_MASK(64)); + err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); if (err) - err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); - if (err) - return err; - - err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)); - if (err) - err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)); + err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); if (err) return err; |