Commit b46f7d33 authored Aug 27, 2021 by Christophe JAILLET Committed by Greg Kroah-Hartman Sep 14, 2021

char: xillybus: 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
Only relevant part are given below.

'xilly_pci_direction()' has been hand modified to simplify it slightly.

It has been compile tested.

@@ @@
-    PCI_DMA_BIDIRECTIONAL
+    DMA_BIDIRECTIONAL

@@ @@
-    PCI_DMA_TODEVICE
+    DMA_TO_DEVICE

@@ @@
-    PCI_DMA_FROMDEVICE
+    DMA_FROM_DEVICE

@@
expression e1, e2;
@@
-    pci_set_dma_mask(e1, e2)
+    dma_set_mask(&e1->dev, e2)

[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/



Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/e25aa2a804972c5d4f06c4c4e0511e11ff97a425.1630083668.git.christophe.jaillet@wanadoo.fr


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent da1c396a

drivers/char/xillybus/xillybus_pcie.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -36,11 +36,10 @@ static int xilly_pci_direction(int direction)
		{
		switch (direction) {
		case DMA_TO_DEVICE:
		return PCI_DMA_TODEVICE;
		case DMA_FROM_DEVICE:
		return PCI_DMA_FROMDEVICE;
		return direction;
		default:
		return PCI_DMA_BIDIRECTIONAL;
		return DMA_BIDIRECTIONAL;
		}
		}

		@@ -185,9 +184,9 @@ static int xilly_probe(struct pci_dev *pdev,
		* So go for the 64-bit mask only when failing is the other option.
		*/

		if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
		if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(32))) {
		endpoint->dma_using_dac = 0;
		} else if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
		} else if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(64))) {
		endpoint->dma_using_dac = 1;
		} else {
		dev_err(endpoint->dev, "Failed to set DMA mask. Aborting.\n");