Commit 27744e00 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

swiotlb: merge swiotlb_unmap_page and unmap_single 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarRobin Murphy <robin.murphy@arm.com>
Reviewed-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent dff8d6c1

kernel/dma/swiotlb.c

+4 −11
Original line number Diff line number Diff line
@@ -765,7 +765,7 @@ dma_addr_t swiotlb_map_page(struct device *dev, struct page *page, 
 * After this call, reads by the cpu to the buffer are guaranteed to see

 * whatever the device wrote there.

 */

static void unmap_single(struct device *hwdev, dma_addr_t dev_addr,

void swiotlb_unmap_page(struct device *hwdev, dma_addr_t dev_addr,

			size_t size, enum dma_data_direction dir,

			unsigned long attrs)

{
@@ -790,13 +790,6 @@ static void unmap_single(struct device *hwdev, dma_addr_t dev_addr, 
	dma_mark_clean(phys_to_virt(paddr), size);

}



void swiotlb_unmap_page(struct device *hwdev, dma_addr_t dev_addr,

			size_t size, enum dma_data_direction dir,

			unsigned long attrs)

{

	unmap_single(hwdev, dev_addr, size, dir, attrs);

}



/*

 * Make physical memory consistent for a single streaming mode DMA translation

 * after a transfer.
@@ -900,7 +893,7 @@ swiotlb_unmap_sg_attrs(struct device *hwdev, struct scatterlist *sgl, 
	BUG_ON(dir == DMA_NONE);



	for_each_sg(sgl, sg, nelems, i)

		unmap_single(hwdev, sg->dma_address, sg_dma_len(sg), dir,

		swiotlb_unmap_page(hwdev, sg->dma_address, sg_dma_len(sg), dir,

			     attrs);

}