Commit 8c155674 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Christoph Hellwig
Browse files

rapidio/tsi721: Remove usage of the deprecated "pci-dma-compat.h" API 

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: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 0fb3436b

drivers/rapidio/devices/tsi721.c

+4 −4
Original line number Diff line number Diff line
@@ -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");

	}