rapidio/tsi721: Remove usage of the deprecated "pci-dma-compat.h" API
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Thu, 6 Jan 2022 21:52:46 +0000 (22:52 +0100)
committerChristoph Hellwig <hch@lst.de>
Fri, 25 Feb 2022 16:19:21 +0000 (17:19 +0100)
In [1], Christoph Hellwig has proposed to remove the wrappers in
include/linux/pci-dma-compat.h.

Some reasons why this API should be removed have been given by Julia
Lawall in [2].

A coccinelle script has been used to perform the needed transformation.
It can be found in [3].

[1]: https://lore.kernel.org/kernel-janitors/20200421081257.GA131897@infradead.org/
[2]: https://lore.kernel.org/kernel-janitors/alpine.DEB.2.22.394.2007120902170.2424@hadrien/
[3]: https://lore.kernel.org/kernel-janitors/20200716192821.321233-1-christophe.jaillet@wanadoo.fr/

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/rapidio/devices/tsi721.c

index 4dd31dd9feeabb0bb55a62bd478a017afa92852f..b3134744fb55c0aba6b0faeca3023498ee704682 100644 (file)
@@ -2836,17 +2836,17 @@ static int tsi721_probe(struct pci_dev *pdev,
        }
 
        /* Configure DMA attributes. */
-       if (pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
-               err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
+       if (dma_set_mask(&pdev->dev, DMA_BIT_MASK(64))) {
+               err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
                if (err) {
                        tsi_err(&pdev->dev, "Unable to set DMA mask");
                        goto err_unmap_bars;
                }
 
-               if (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)))
+               if (dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)))
                        tsi_info(&pdev->dev, "Unable to set consistent DMA mask");
        } else {
-               err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
+               err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));
                if (err)
                        tsi_info(&pdev->dev, "Unable to set consistent DMA mask");
        }