diff options
| author | Christoph Hellwig <hch@lst.de> | 2015-11-26 12:59:00 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-11-26 15:23:06 +1100 |
| commit | 7e909286db8307b0b671d63d40e94b88e781496e (patch) | |
| tree | 3e43cc668ed3d36bf61dad81dee9679c5211cb8b | |
| parent | 022dd03841bcfbd2f0d10313c1469b03ed7ebc6b (diff) | |
nios2: dma mapping fixes
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reported-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
| -rw-r--r-- | arch/nios2/mm/dma-mapping.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/arch/nios2/mm/dma-mapping.c b/arch/nios2/mm/dma-mapping.c index 43c1149b2139..90422c367ed3 100644 --- a/arch/nios2/mm/dma-mapping.c +++ b/arch/nios2/mm/dma-mapping.c @@ -128,7 +128,7 @@ static void nios2_dma_unmap_page(struct device *dev, dma_addr_t dma_address, __dma_sync_for_cpu(phys_to_virt(dma_address), size, direction); } -static void dma_unmap_sg(struct device *dev, struct scatterlist *sg, +static void nios2_dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries, enum dma_data_direction direction, struct dma_attrs *attrs) { @@ -183,13 +183,15 @@ static void nios2_dma_sync_sg_for_device(struct device *dev, } struct dma_map_ops nios2_dma_ops = { - .alloc = nios2_dma_alloc, - .free = nios2_dma_free, - .map_page = nios2_dma_map_page, - .map_sg = nios2_dma_map_sg, - .sync_single_for_device = nios2_dma_sync_single_for_device, - .sync_single_for_cpu = nios2_dma_sync_single_for_cpu, - .sync_sg_for_cpu = nios2_dma_sync_sg_for_cpu, - .sync_sg_for_dev = nios2_dma_sync_sg_for_device, + .alloc = nios2_dma_alloc, + .free = nios2_dma_free, + .map_page = nios2_dma_map_page, + .unmap_page = nios2_dma_unmap_page, + .map_sg = nios2_dma_map_sg, + .unmap_sg = nios2_dma_unmap_sg, + .sync_single_for_device = nios2_dma_sync_single_for_device, + .sync_single_for_cpu = nios2_dma_sync_single_for_cpu, + .sync_sg_for_cpu = nios2_dma_sync_sg_for_cpu, + .sync_sg_for_device = nios2_dma_sync_sg_for_device, }; EXPORT_SYMBOL(nios2_dma_ops); |