From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752915AbcGMImN (ORCPT ); Wed, 13 Jul 2016 04:42:13 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:21825 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752839AbcGMImJ (ORCPT ); Wed, 13 Jul 2016 04:42:09 -0400 X-AuditID: cbfec7f5-f792a6d000001302-ba-5785fed83167 From: Krzysztof Kozlowski To: Andrew Morton Cc: linux-kernel@vger.kernel.org, hch@infradead.org, Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , Vineet Gupta , linux-snps-arc@lists.infradead.org Subject: [PATCH v6 04/46] arc: dma-mapping: Use unsigned long for dma_attrs Date: Wed, 13 Jul 2016 10:40:55 +0200 Message-id: <1468399300-5399-4-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1468399300-5399-3-git-send-email-k.kozlowski@samsung.com> References: <1468399167-28083-1-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-1-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-2-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-3-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprGLMWRmVeSWpSXmKPExsVy+t/xq7o3/rWGG7TvMLeYs34Nm8XGGetZ LU5PWMRk8fqFocXlXXPYLFrvrGWyOLT1EYsDu8fmFVoeJ2b8ZvHYvKTeo2/LKkaPLfs/M3p8 3iQXwBbFZZOSmpNZllqkb5fAlbG9TaBgIl9F16LN7A2MJ7m7GDk5JARMJNbvaWGCsMUkLtxb z9bFyMUhJLCUUeLVl+vMEE4jk0TL1z+MIFVsAsYSm5cvYQOxRQR0JVY93wVWxCzwjFHi3OHJ zCAJYQFviYP9M9lBbBYBVYmGbQ2sXYwcHLwCbhIHd8RAbJOTOHlsMiuIzSngLnFmdTcjxLJ/ jBK3u3uYJjDyLmBkWMUomlqaXFCclJ5rpFecmFtcmpeul5yfu4kRElpfdzAuPWZ1iFGAg1GJ h3eFYGu4EGtiWXFl7iFGCQ5mJRFe059AId6UxMqq1KL8+KLSnNTiQ4zSHCxK4rwzd70PERJI TyxJzU5NLUgtgskycXBKNTC2pWazP91a9rrNUJyp4ny6zAb7ucePbd31Ralsz77+qzF6erfb NaJbL7c2XnQX59nilvbV0U+0r+zvg7Oe3ExFES8evu4vtqhll7S2rmK7e1hsiwffDq8voec0 TJmyO6Os69+YvCm3PvHMsU/26iq+L2l7366ffETxTtTJDVMVlt/5b6lh/02JpTgj0VCLuag4 EQADFfurKQIAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Split out subsystem specific changes for easier reviews. This will be squashed with main commit. Signed-off-by: Krzysztof Kozlowski [for arc] Acked-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 73d7e4c75b7d..3d1f467d1792 100644 --- a/arch/arc/mm/dma.c +++ b/arch/arc/mm/dma.c @@ -22,7 +22,7 @@ static void *arc_dma_alloc(struct device *dev, size_t size, - dma_addr_t *dma_handle, gfp_t gfp, struct dma_attrs *attrs) + dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs) { unsigned long order = get_order(size); struct page *page; @@ -90,7 +90,7 @@ static void *arc_dma_alloc(struct device *dev, size_t size, } static void arc_dma_free(struct device *dev, size_t size, void *vaddr, - dma_addr_t dma_handle, struct dma_attrs *attrs) + dma_addr_t dma_handle, unsigned long attrs) { struct page *page = virt_to_page(dma_handle); int is_non_coh = 1; @@ -129,7 +129,7 @@ static void _dma_cache_sync(phys_addr_t paddr, size_t size, static dma_addr_t arc_dma_map_page(struct device *dev, struct page *page, unsigned long offset, size_t size, enum dma_data_direction dir, - struct dma_attrs *attrs) + unsigned long attrs) { phys_addr_t paddr = page_to_phys(page) + offset; _dma_cache_sync(paddr, size, dir); @@ -137,7 +137,7 @@ static dma_addr_t arc_dma_map_page(struct device *dev, struct page *page, } static int arc_dma_map_sg(struct device *dev, struct scatterlist *sg, - int nents, enum dma_data_direction dir, struct dma_attrs *attrs) + int nents, enum dma_data_direction dir, unsigned long attrs) { struct scatterlist *s; int i; -- 1.9.1