Commit 06cc5cf1 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Christoph Hellwig
Browse files

alpha: 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: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent e62c17f0

arch/alpha/include/asm/floppy.h

+4 −3
Original line number Diff line number Diff line
@@ -43,17 +43,18 @@ alpha_fd_dma_setup(char *addr, unsigned long size, int mode, int io) 
	static int prev_dir;

	int dir;



	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, bus_addr, prev_size, prev_dir);

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

				 prev_dir);

		bus_addr = 0;

	}



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

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

		bus_addr = dma_map_single(&isa_bridge->dev, addr, size, dir);



	/* remember this one as prev */

	prev_addr = addr;

arch/alpha/kernel/pci_iommu.c

+6 −6
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ static dma_addr_t alpha_pci_map_page(struct device *dev, struct page *page, 
	struct pci_dev *pdev = alpha_gendev_to_pci(dev);

	int dac_allowed;



	BUG_ON(dir == PCI_DMA_NONE);

	BUG_ON(dir == DMA_NONE);



	dac_allowed = pdev ? pci_dac_dma_supported(pdev, pdev->dma_mask) : 0; 

	return pci_map_single_1(pdev, (char *)page_address(page) + offset,
@@ -356,7 +356,7 @@ static void alpha_pci_unmap_page(struct device *dev, dma_addr_t dma_addr, 
	struct pci_iommu_arena *arena;

	long dma_ofs, npages;



	BUG_ON(dir == PCI_DMA_NONE);

	BUG_ON(dir == DMA_NONE);



	if (dma_addr >= __direct_map_base

	    && dma_addr < __direct_map_base + __direct_map_size) {
@@ -460,7 +460,7 @@ static void alpha_pci_free_coherent(struct device *dev, size_t size, 
				    unsigned long attrs)

{

	struct pci_dev *pdev = alpha_gendev_to_pci(dev);

	pci_unmap_single(pdev, dma_addr, size, PCI_DMA_BIDIRECTIONAL);

	dma_unmap_single(&pdev->dev, dma_addr, size, DMA_BIDIRECTIONAL);

	free_pages((unsigned long)cpu_addr, get_order(size));



	DBGA2("pci_free_consistent: [%llx,%zx] from %ps\n",
@@ -639,7 +639,7 @@ static int alpha_pci_map_sg(struct device *dev, struct scatterlist *sg, 
	dma_addr_t max_dma;

	int dac_allowed;



	BUG_ON(dir == PCI_DMA_NONE);

	BUG_ON(dir == DMA_NONE);



	dac_allowed = dev ? pci_dac_dma_supported(pdev, pdev->dma_mask) : 0;
@@ -702,7 +702,7 @@ static int alpha_pci_map_sg(struct device *dev, struct scatterlist *sg, 
	/* Some allocation failed while mapping the scatterlist

	   entries.  Unmap them now.  */

	if (out > start)

		pci_unmap_sg(pdev, start, out - start, dir);

		dma_unmap_sg(&pdev->dev, start, out - start, dir);

	return -ENOMEM;

}
@@ -722,7 +722,7 @@ static void alpha_pci_unmap_sg(struct device *dev, struct scatterlist *sg, 
	dma_addr_t max_dma;

	dma_addr_t fbeg, fend;



	BUG_ON(dir == PCI_DMA_NONE);

	BUG_ON(dir == DMA_NONE);



	if (! alpha_mv.mv_pci_tbi)

		return;