From patchwork Fri Jun 10 10:11:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 633625 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rQyfc63Ltz9sD3 for ; Fri, 10 Jun 2016 20:12:56 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1bBJQt-0001CO-BC; Fri, 10 Jun 2016 10:12:55 +0000 Received: from mailout2.w1.samsung.com ([210.118.77.12]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1bBJQj-00011w-Pp for linux-snps-arc@lists.infradead.org; Fri, 10 Jun 2016 10:12:47 +0000 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout2.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0O8J004SXWCNDX70@mailout2.w1.samsung.com> for linux-snps-arc@lists.infradead.org; Fri, 10 Jun 2016 11:12:23 +0100 (BST) X-AuditID: cbfec7f4-f796c6d000001486-5f-575a928792f8 Received: from eusync4.samsung.com ( [203.254.199.214]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id AF.75.05254.7829A575; Fri, 10 Jun 2016 11:12:23 +0100 (BST) Received: from AMDC2174.DIGITAL.local ([106.120.53.17]) by eusync4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0O8J00MI3WC5KUB0@eusync4.samsung.com>; Fri, 10 Jun 2016 11:12:23 +0100 (BST) From: Krzysztof Kozlowski To: Andrew Morton 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= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160610_031246_140245_BCFAC1FE X-CRM114-Status: GOOD ( 13.43 ) X-Spam-Score: -8.3 (--------) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-8.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [210.118.77.12 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [210.118.77.12 listed in wl.mailspike.net] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.4 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: linux-snps-arc@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux on Synopsys ARC Processors List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Krzysztof Kozlowski , linux-snps-arc@lists.infradead.org, Bartlomiej Zolnierkiewicz , Vineet Gupta , Alexey Brodkin , linux-kernel@vger.kernel.org, hch@infradead.org, Andrea Gelmini MIME-Version: 1.0 Sender: "linux-snps-arc" Errors-To: linux-snps-arc-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Split out subsystem specific changes for easier reviews. This will be squashed with main commit. Signed-off-by: Krzysztof Kozlowski 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;