Commit 639fd77e authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Greg Kroah-Hartman
Browse files

tifm: 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].

Finally, Arnd Bergmann reminded that the documentation was updated 11 years
ago to only describe the modern linux/dma-mapping.h interfaces and mark the
old bus-specific ones as no longer recommended, see commit 216bf58f
("Documentation: convert PCI-DMA-mapping.txt to use the generic DMA API").

A coccinelle script has been used to perform the needed transformation
Only relevant parts are given below.

@@
expression e1, e2, e3, e4;
@@
-    pci_map_sg(e1, e2, e3, e4)
+    dma_map_sg(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_unmap_sg(e1, e2, e3, e4)
+    dma_unmap_sg(&e1->dev, e2, e3, e4)

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



Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/b5296677f92f7bace957e66479b3d57a5a824ca1.1631942796.git.christophe.jaillet@wanadoo.fr


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5e87622c

drivers/misc/tifm_7xx1.c

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ static int tifm_7xx1_probe(struct pci_dev *dev, 
	int pci_dev_busy = 0;

	int rc;



	rc = pci_set_dma_mask(dev, DMA_BIT_MASK(32));

	rc = dma_set_mask(&dev->dev, DMA_BIT_MASK(32));

	if (rc)

		return rc;

drivers/misc/tifm_core.c

+3 −2
Original line number Diff line number Diff line
@@ -292,14 +292,15 @@ EXPORT_SYMBOL(tifm_has_ms_pif); 
int tifm_map_sg(struct tifm_dev *sock, struct scatterlist *sg, int nents,

		int direction)

{

	return pci_map_sg(to_pci_dev(sock->dev.parent), sg, nents, direction);

	return dma_map_sg(&to_pci_dev(sock->dev.parent)->dev, sg, nents,

			  direction);

}

EXPORT_SYMBOL(tifm_map_sg);



void tifm_unmap_sg(struct tifm_dev *sock, struct scatterlist *sg, int nents,

		   int direction)

{

	pci_unmap_sg(to_pci_dev(sock->dev.parent), sg, nents, direction);

	dma_unmap_sg(&to_pci_dev(sock->dev.parent)->dev, sg, nents, direction);

}

EXPORT_SYMBOL(tifm_unmap_sg);