Commit 01135d92 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] dma: Reduce to one dma_map_sg()/dma_unmap_sg() implementation 



No point having two of these; dma_map_page() can do all the work
for us.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 56f55f8b

arch/arm/common/dmabounce.c

+0 −46
Original line number Diff line number Diff line
@@ -444,50 +444,6 @@ dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size, 
	unmap_single(dev, dma_addr, size, dir);

}



int

dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,

		enum dma_data_direction dir)

{

	struct scatterlist *s;

	int i;



	dev_dbg(dev, "%s(sg=%p,nents=%d,dir=%x)\n",

		__func__, sg, nents, dir);



	BUG_ON(dir == DMA_NONE);



	for_each_sg(sg, s, nents, i) {

		struct page *page = sg_page(s);

		unsigned int offset = s->offset;

		unsigned int length = s->length;

		void *ptr = page_address(page) + offset;



		s->dma_address = map_single(dev, ptr, length, dir);

	}



	return nents;

}



void

dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nents,

		enum dma_data_direction dir)

{

	struct scatterlist *s;

	int i;



	dev_dbg(dev, "%s(sg=%p,nents=%d,dir=%x)\n",

		__func__, sg, nents, dir);



	BUG_ON(dir == DMA_NONE);



	for_each_sg(sg, s, nents, i) {

		dma_addr_t dma_addr = s->dma_address;

		unsigned int length = s->length;



		unmap_single(dev, dma_addr, length, dir);

	}

}



void dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t dma_addr,

				   unsigned long offset, size_t size,

				   enum dma_data_direction dir)
@@ -662,8 +618,6 @@ dmabounce_unregister_dev(struct device *dev) 


EXPORT_SYMBOL(dma_map_single);

EXPORT_SYMBOL(dma_unmap_single);

EXPORT_SYMBOL(dma_map_sg);

EXPORT_SYMBOL(dma_unmap_sg);

EXPORT_SYMBOL(dma_sync_sg_for_cpu);

EXPORT_SYMBOL(dma_sync_sg_for_device);

EXPORT_SYMBOL(dmabounce_register_dev);

arch/arm/mm/dma-mapping.c

+16 −8
Original line number Diff line number Diff line
@@ -513,7 +513,6 @@ void dma_cache_maint(const void *start, size_t size, int direction) 
}

EXPORT_SYMBOL(dma_cache_maint);



#ifndef CONFIG_DMABOUNCE

/**

 * dma_map_sg - map a set of SG buffers for streaming mode DMA

 * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
@@ -534,16 +533,20 @@ int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, 
		enum dma_data_direction dir)

{

	struct scatterlist *s;

	int i;

	int i, j;



	for_each_sg(sg, s, nents, i) {

		s->dma_address = page_to_dma(dev, sg_page(s)) + s->offset;



		if (!arch_is_coherent())

			dma_cache_maint(sg_virt(s), s->length, dir);

		s->dma_address = dma_map_page(dev, sg_page(s), s->offset,

						s->length, dir);

		if (dma_mapping_error(dev, s->dma_address))

			goto bad_mapping;

	}



	return nents;



 bad_mapping:

	for_each_sg(sg, s, i, j)

		dma_unmap_page(dev, sg_dma_address(s), sg_dma_len(s), dir);

	return 0;

}

EXPORT_SYMBOL(dma_map_sg);
@@ -560,10 +563,15 @@ EXPORT_SYMBOL(dma_map_sg); 
void dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nents,

		enum dma_data_direction dir)

{

	/* nothing to do */

	struct scatterlist *s;

	int i;



	for_each_sg(sg, s, nents, i)

		dma_unmap_page(dev, sg_dma_address(s), sg_dma_len(s), dir);

}

EXPORT_SYMBOL(dma_unmap_sg);



#ifndef CONFIG_DMABOUNCE

/**

 * dma_sync_sg_for_cpu

 * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices