Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>

authored by

Christophe JAILLET and committed by
Christoph Hellwig
8c155674 0fb3436b

+4 -4
+4 -4
drivers/rapidio/devices/tsi721.c
··· 2836 2836 } 2837 2837 2838 2838 /* Configure DMA attributes. */ 2839 - if (pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) { 2840 - err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); 2839 + if (dma_set_mask(&pdev->dev, DMA_BIT_MASK(64))) { 2840 + err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); 2841 2841 if (err) { 2842 2842 tsi_err(&pdev->dev, "Unable to set DMA mask"); 2843 2843 goto err_unmap_bars; 2844 2844 } 2845 2845 2846 - if (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32))) 2846 + if (dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32))) 2847 2847 tsi_info(&pdev->dev, "Unable to set consistent DMA mask"); 2848 2848 } else { 2849 - err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)); 2849 + err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64)); 2850 2850 if (err) 2851 2851 tsi_info(&pdev->dev, "Unable to set consistent DMA mask"); 2852 2852 }