Commit 5e87622c authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Greg Kroah-Hartman
Browse files

misc: genwqe: 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.

@@ @@
-    PCI_DMA_BIDIRECTIONAL
+    DMA_BIDIRECTIONAL@@

@@
expression e1, e2, e3, e4, e5;
@@
-    pci_map_page(e1, e2, e3, e4, e5)
+    dma_map_page(&e1->dev, e2, e3, e4, e5)

@@
expression e1, e2, e3, e4;
@@
-    pci_unmap_page(e1, e2, e3, e4)
+    dma_unmap_page(&e1->dev, e2, e3, e4)

@@
expression e1, e2;
@@
-    pci_dma_mapping_error(e1, e2)
+    dma_mapping_error(&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/590154f2ab113088346ae76c3f13f8b1cbebccbb.1631942274.git.christophe.jaillet@wanadoo.fr


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

drivers/misc/genwqe/card_utils.c

+5 −5
Original line number Diff line number Diff line
@@ -233,8 +233,8 @@ static void genwqe_unmap_pages(struct genwqe_dev *cd, dma_addr_t *dma_list, 
	struct pci_dev *pci_dev = cd->pci_dev;



	for (i = 0; (i < num_pages) && (dma_list[i] != 0x0); i++) {

		pci_unmap_page(pci_dev, dma_list[i],

			       PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);

		dma_unmap_page(&pci_dev->dev, dma_list[i], PAGE_SIZE,

			       DMA_BIDIRECTIONAL);

		dma_list[i] = 0x0;

	}

}
@@ -251,12 +251,12 @@ static int genwqe_map_pages(struct genwqe_dev *cd, 
		dma_addr_t daddr;



		dma_list[i] = 0x0;

		daddr = pci_map_page(pci_dev, page_list[i],

		daddr = dma_map_page(&pci_dev->dev, page_list[i],

				     0,	 /* map_offs */

				     PAGE_SIZE,

				     PCI_DMA_BIDIRECTIONAL);  /* FIXME rd/rw */

				     DMA_BIDIRECTIONAL);  /* FIXME rd/rw */



		if (pci_dma_mapping_error(pci_dev, daddr)) {

		if (dma_mapping_error(&pci_dev->dev, daddr)) {

			dev_err(&pci_dev->dev,

				"[%s] err: no dma addr daddr=%016llx!\n",

				__func__, (long long)daddr);