Commit e57c2fd6 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Michael Ellerman
Browse files

powerpc/floppy: 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 parts are given below.

@@ @@
-    PCI_DMA_TODEVICE
+    DMA_TO_DEVICE

@@ @@
-    PCI_DMA_FROMDEVICE
+    DMA_FROM_DEVICE

@@
expression e1, e2, e3, e4;
@@
-    pci_map_single(e1, e2, e3, e4)
+    dma_map_single(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_unmap_single(e1, e2, e3, e4)
+    dma_unmap_single(&e1->dev, e2, e3, e4)

[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: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/9e24eedeab44cbb840598bb188561a48811de845.1641119338.git.christophe.jaillet@wanadoo.fr
parent beeac538

arch/powerpc/include/asm/floppy.h

+5 −3
Original line number Diff line number Diff line
@@ -134,17 +134,19 @@ static int hard_dma_setup(char *addr, unsigned long size, int mode, int io) 
	int dir;



	doing_vdma = 0;

	dir = (mode == DMA_MODE_READ) ? PCI_DMA_FROMDEVICE : PCI_DMA_TODEVICE;

	dir = (mode == DMA_MODE_READ) ? DMA_FROM_DEVICE : DMA_TO_DEVICE;



	if (bus_addr 

	    && (addr != prev_addr || size != prev_size || dir != prev_dir)) {

		/* different from last time -- unmap prev */

		pci_unmap_single(isa_bridge_pcidev, bus_addr, prev_size, prev_dir);

		dma_unmap_single(&isa_bridge_pcidev->dev, bus_addr, prev_size,

				 prev_dir);

		bus_addr = 0;

	}



	if (!bus_addr)	/* need to map it */

		bus_addr = pci_map_single(isa_bridge_pcidev, addr, size, dir);

		bus_addr = dma_map_single(&isa_bridge_pcidev->dev, addr, size,

					  dir);



	/* remember this one as prev */

	prev_addr = addr;