Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9690e34f authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Greg Kroah-Hartman
Browse files

dma-mapping: drop the dev argument to arch_sync_dma_for_* 



[ Upstream commit 56e35f9c5b87ec1ae93e483284e189c84388de16 ]

These are pure cache maintainance routines, so drop the unused
struct device argument.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Suggested-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Stable-dep-of: ab327f8acdf8 ("mips: bmips: BCM6358: disable RAC flush for TP1")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f6e2d76a

arch/arc/mm/dma.c

+4 −4
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ void arch_dma_prep_coherent(struct page *page, size_t size) 
 * upper layer functions (in include/linux/dma-mapping.h)

 */



void arch_sync_dma_for_device(struct device *dev, phys_addr_t paddr,

		size_t size, enum dma_data_direction dir)

void arch_sync_dma_for_device(phys_addr_t paddr, size_t size,

		enum dma_data_direction dir)

{

	switch (dir) {

	case DMA_TO_DEVICE:
@@ -69,8 +69,8 @@ void arch_sync_dma_for_device(struct device *dev, phys_addr_t paddr, 
	}

}



void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr,

		size_t size, enum dma_data_direction dir)

void arch_sync_dma_for_cpu(phys_addr_t paddr, size_t size,

		enum dma_data_direction dir)

{

	switch (dir) {

	case DMA_TO_DEVICE:

arch/arm/mm/dma-mapping.c

+4 −4
Original line number Diff line number Diff line
@@ -2332,15 +2332,15 @@ void arch_teardown_dma_ops(struct device *dev) 
}



#ifdef CONFIG_SWIOTLB

void arch_sync_dma_for_device(struct device *dev, phys_addr_t paddr,

		size_t size, enum dma_data_direction dir)

void arch_sync_dma_for_device(phys_addr_t paddr, size_t size,

		enum dma_data_direction dir)

{

	__dma_page_cpu_to_dev(phys_to_page(paddr), paddr & (PAGE_SIZE - 1),

			      size, dir);

}



void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr,

		size_t size, enum dma_data_direction dir)

void arch_sync_dma_for_cpu(phys_addr_t paddr, size_t size,

		enum dma_data_direction dir)

{

	__dma_page_dev_to_cpu(phys_to_page(paddr), paddr & (PAGE_SIZE - 1),

			      size, dir);

arch/arm/xen/mm.c

+6 −6
Original line number Diff line number Diff line
@@ -70,20 +70,20 @@ static void dma_cache_maint(dma_addr_t handle, size_t size, u32 op) 
 * pfn_valid returns true the pages is local and we can use the native

 * dma-direct functions, otherwise we call the Xen specific version.

 */

void xen_dma_sync_for_cpu(struct device *dev, dma_addr_t handle,

		phys_addr_t paddr, size_t size, enum dma_data_direction dir)

void xen_dma_sync_for_cpu(dma_addr_t handle, phys_addr_t paddr, size_t size,

		enum dma_data_direction dir)

{

	if (pfn_valid(PFN_DOWN(handle)))

		arch_sync_dma_for_cpu(dev, paddr, size, dir);

		arch_sync_dma_for_cpu(paddr, size, dir);

	else if (dir != DMA_TO_DEVICE)

		dma_cache_maint(handle, size, GNTTAB_CACHE_INVAL);

}



void xen_dma_sync_for_device(struct device *dev, dma_addr_t handle,

		phys_addr_t paddr, size_t size, enum dma_data_direction dir)

void xen_dma_sync_for_device(dma_addr_t handle, phys_addr_t paddr, size_t size,

		enum dma_data_direction dir)

{

	if (pfn_valid(PFN_DOWN(handle)))

		arch_sync_dma_for_device(dev, paddr, size, dir);

		arch_sync_dma_for_device(paddr, size, dir);

	else if (dir == DMA_FROM_DEVICE)

		dma_cache_maint(handle, size, GNTTAB_CACHE_INVAL);

	else

arch/arm64/mm/dma-mapping.c

+4 −4
Original line number Diff line number Diff line
@@ -13,14 +13,14 @@ 


#include <asm/cacheflush.h>



void arch_sync_dma_for_device(struct device *dev, phys_addr_t paddr,

		size_t size, enum dma_data_direction dir)

void arch_sync_dma_for_device(phys_addr_t paddr, size_t size,

		enum dma_data_direction dir)

{

	__dma_map_area(phys_to_virt(paddr), size, dir);

}



void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr,

		size_t size, enum dma_data_direction dir)

void arch_sync_dma_for_cpu(phys_addr_t paddr, size_t size,

		enum dma_data_direction dir)

{

	__dma_unmap_area(phys_to_virt(paddr), size, dir);

}

arch/c6x/mm/dma-coherent.c

+7 −7
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ void __init coherent_mem_init(phys_addr_t start, u32 size) 
		      sizeof(long));

}



static void c6x_dma_sync(struct device *dev, phys_addr_t paddr, size_t size,

static void c6x_dma_sync(phys_addr_t paddr, size_t size,

		enum dma_data_direction dir)

{

	BUG_ON(!valid_dma_direction(dir));
@@ -160,14 +160,14 @@ static void c6x_dma_sync(struct device *dev, phys_addr_t paddr, size_t size, 
	}

}



void arch_sync_dma_for_device(struct device *dev, phys_addr_t paddr,

		size_t size, enum dma_data_direction dir)

void arch_sync_dma_for_device(phys_addr_t paddr, size_t size,

		enum dma_data_direction dir)

{

	return c6x_dma_sync(dev, paddr, size, dir);

	return c6x_dma_sync(paddr, size, dir);

}



void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr,

		size_t size, enum dma_data_direction dir)

void arch_sync_dma_for_cpu(phys_addr_t paddr, size_t size,

		enum dma_data_direction dir)

{

	return c6x_dma_sync(dev, paddr, size, dir);

	return c6x_dma_sync(paddr, size, dir);

}