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

Commit 712d3e22 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Linus Torvalds
Browse files

powerpc: remove unnecessary sync_single_range_* in swiotlb_dma_ops 



sync_single_range_for_cpu and sync_single_range_for_device hooks in
swiotlb_dma_ops are unnecessary because sync_single_for_cpu and
sync_single_for_device are used there.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Becky Bruce <beckyb@kernel.crashing.org>
Reviewed-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent de006a07

arch/powerpc/kernel/dma-swiotlb.c

+2 −2
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ struct dma_map_ops swiotlb_dma_ops = { 
	.dma_supported = swiotlb_dma_supported,

	.map_page = swiotlb_map_page,

	.unmap_page = swiotlb_unmap_page,

	.sync_single_range_for_cpu = swiotlb_sync_single_range_for_cpu,

	.sync_single_range_for_device = swiotlb_sync_single_range_for_device,

	.sync_single_for_cpu = swiotlb_sync_single_for_cpu,

	.sync_single_for_device = swiotlb_sync_single_for_device,

	.sync_sg_for_cpu = swiotlb_sync_sg_for_cpu,

	.sync_sg_for_device = swiotlb_sync_sg_for_device,

	.mapping_error = swiotlb_dma_mapping_error,

arch/powerpc/kernel/dma.c

+6 −6
Original line number Diff line number Diff line
@@ -127,11 +127,11 @@ static inline void dma_direct_sync_sg(struct device *dev, 
		__dma_sync_page(sg_page(sg), sg->offset, sg->length, direction);

}



static inline void dma_direct_sync_single_range(struct device *dev,

		dma_addr_t dma_handle, unsigned long offset, size_t size,

static inline void dma_direct_sync_single(struct device *dev,

					  dma_addr_t dma_handle, size_t size,

					  enum dma_data_direction direction)

{

	__dma_sync(bus_to_virt(dma_handle+offset), size, direction);

	__dma_sync(bus_to_virt(dma_handle), size, direction);

}

#endif
@@ -144,8 +144,8 @@ struct dma_map_ops dma_direct_ops = { 
	.map_page	= dma_direct_map_page,

	.unmap_page	= dma_direct_unmap_page,

#ifdef CONFIG_NOT_COHERENT_CACHE

	.sync_single_range_for_cpu 	= dma_direct_sync_single_range,

	.sync_single_range_for_device 	= dma_direct_sync_single_range,

	.sync_single_for_cpu 		= dma_direct_sync_single,

	.sync_single_for_device 	= dma_direct_sync_single,

	.sync_sg_for_cpu 		= dma_direct_sync_sg,

	.sync_sg_for_device 		= dma_direct_sync_sg,

#endif