From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752603AbbKVQaz (ORCPT ); Sun, 22 Nov 2015 11:30:55 -0500 Received: from bombadil.infradead.org ([198.137.202.9]:33837 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752138AbbKVQaY (ORCPT ); Sun, 22 Nov 2015 11:30:24 -0500 From: Christoph Hellwig To: akpm@linux-foundation.org Cc: msalter@redhat.com, a-jacquiot@ti.com, linux-kernel@vger.kernel.org, dan.carpenter@oracle.com, linux@roeck-us.net Subject: [PATCH 2/4] arc: dma mapping fixes Date: Sun, 22 Nov 2015 17:25:44 +0100 Message-Id: <1448209546-24404-3-git-send-email-hch@lst.de> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1448209546-24404-1-git-send-email-hch@lst.de> References: <1448209546-24404-1-git-send-email-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Reported-by: Guenter Roeck Signed-off-by: Christoph Hellwig --- 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 da289cb..695029f 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