Skip to content

Commit 0c5afef

Browse files
Qing Wangvinodkoul
authored andcommitted
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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Vinod Koul <[email protected]>
1 parent bec897e commit 0c5afef

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

drivers/dma/ioat/init.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1363,15 +1363,9 @@ static int ioat_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
13631363
if (!iomap)
13641364
return -ENOMEM;
13651365

1366-
err = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
1366+
err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
13671367
if (err)
1368-
err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
1369-
if (err)
1370-
return err;
1371-
1372-
err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
1373-
if (err)
1374-
err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
1368+
err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
13751369
if (err)
13761370
return err;
13771371

0 commit comments

Comments
 (0)