From d924a26542660cd1ac68f8f86f8b646835ef5179 Mon Sep 17 00:00:00 2001 From: Vineet Gupta Date: Tue, 24 Nov 2015 09:46:05 +0530 Subject: [PATCH] arc: fix wreakage of conversion to dma_map_ops Obviously the initial patch was not build tested. Reported-by: Anton Kolesov Signed-off-by: Vineet Gupta --- arch/arc/mm/dma.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arc/mm/dma.c b/arch/arc/mm/dma.c index da289cb30ca5..695029f41a48 100644 --- a/arch/arc/mm/dma.c +++ b/arch/arc/mm/dma.c @@ -46,7 +46,7 @@ static void *arc_dma_alloc(struct device *dev, size_t size, * (vs. always going to memory - thus are faster) */ if ((is_isa_arcv2() && ioc_exists) || - dma_get_attr(DMA_ATTR_NON_CONSISTENT, attrs) + dma_get_attr(DMA_ATTR_NON_CONSISTENT, attrs)) return paddr; /* This is kernel Virtual address (0x7000_0000 based) */ @@ -74,7 +74,7 @@ static void arc_dma_free(struct device *dev, size_t size, void *vaddr, { if (!(is_isa_arcv2() && ioc_exists) || dma_get_attr(DMA_ATTR_NON_CONSISTENT, attrs)) - iounmap((void __force __iomem *)kvaddr); + iounmap((void __force __iomem *)vaddr); free_pages_exact((void *)dma_handle, size); } @@ -135,7 +135,7 @@ static void arc_dma_sync_single_for_device(struct device *dev, _dma_cache_sync(dma_handle, size, DMA_TO_DEVICE); } -static void arm_dma_sync_sg_for_cpu(struct device *dev, +static void arc_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sglist, int nelems, enum dma_data_direction dir) { @@ -171,7 +171,7 @@ struct dma_map_ops arc_dma_ops = { .sync_single_for_device = arc_dma_sync_single_for_device, .sync_single_for_cpu = arc_dma_sync_single_for_cpu, .sync_sg_for_cpu = arc_dma_sync_sg_for_cpu, - .sync_sg_for_dev = arc_dma_sync_sg_for_device, + .sync_sg_for_device = arc_dma_sync_sg_for_device, .dma_supported = arc_dma_supported, }; EXPORT_SYMBOL(arc_dma_ops); -- 1.9.1