From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161085AbcFJK0w (ORCPT ); Fri, 10 Jun 2016 06:26:52 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:43972 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753094AbcFJKM0 (ORCPT ); Fri, 10 Jun 2016 06:12:26 -0400 X-AuditID: cbfec7f4-f796c6d000001486-5f-575a928792f8 From: Krzysztof Kozlowski To: Andrew Morton Cc: hch@infradead.org, Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , Vineet Gupta , Alexey Brodkin , Andrea Gelmini , linux-snps-arc@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 03/44] arc: dma-mapping: Use unsigned long for dma_attrs Date: Fri, 10 Jun 2016 12:11:20 +0200 Message-id: <1465553521-27303-4-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1465553521-27303-1-git-send-email-k.kozlowski@samsung.com> References: <1465553521-27303-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrCLMWRmVeSWpSXmKPExsVy+t/xa7rtk6LCDVZ1M1s0X33KbjFn/Ro2 iy0dH9gsNs5Yz2pxesIiJovXLwwtLu+aw2bRemctk8WhrY9YHDg9ju5P8di8QsvjxIzfLB6b l9R79G1ZxeixZf9nRo/Pm+QC2KO4bFJSczLLUov07RK4MjrP/GAquMFbse3wCrYGxhncXYyc HBICJhI73r9khbDFJC7cW8/WxcjFISSwlFHi7tzP7BBOI5PE73UrmEGq2ASMJTYvX8IGYosI 6Eqser6LGaSIWWA3k8T1VzPAEsIC3hIbf/wDGsvBwSKgKvF/vxlImFfAXeLQ1Q42iG1yEieP TQbbzCngIdF9dyYLiC0EVLP9ySumCYy8CxgZVjGKppYmFxQnpeca6hUn5haX5qXrJefnbmKE hN2XHYyLj1kdYhTgYFTi4Y3YFRkuxJpYVlyZe4hRgoNZSYTXoi8qXIg3JbGyKrUoP76oNCe1 +BCjNAeLkjjv3F3vQ4QE0hNLUrNTUwtSi2CyTBycUg2MfHnXgvUWis1tOeXZ0br8H8veO7/+ NrL99LRoz14okHJg26Pmjq/WXVfuyGjtPHo48aTy2/xD+6YVbTz5V3u+U2TOyh72MyFcNgVX rX0T9aZeKTdpXSKz6JbNs3PmUiz283UeHpTUcd8pl6zYX5ApKvFA9SeLjrJUrtcjN4u8mMmP nGavzZRTYinOSDTUYi4qTgQAJPvwOTcCAAA= 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 --- 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