From patchwork Thu Jun 2 15:39:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 9170749 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 204B160890 for ; Fri, 10 Jun 2016 23:37:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 11C3F2824F for ; Fri, 10 Jun 2016 23:37:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0573428363; Fri, 10 Jun 2016 23:37:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AED752833F for ; Fri, 10 Jun 2016 23:37:56 +0000 (UTC) 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 1bBVzw-0004cB-AC; Fri, 10 Jun 2016 23:37:56 +0000 Received: from mailout4.w1.samsung.com ([210.118.77.14]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b8Ujr-0001JP-Jb; Thu, 02 Jun 2016 15:40:52 +0000 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0O8500C9MI7PZ110@mailout4.w1.samsung.com>; Thu, 02 Jun 2016 16:40:37 +0100 (BST) X-AuditID: cbfec7f4-f796c6d000001486-d3-575053754b03 Received: from eusync1.samsung.com ( [203.254.199.211]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id E1.0A.05254.57350575; Thu, 2 Jun 2016 16:40:37 +0100 (BST) Received: from AMDC2174.DIGITAL.local ([106.120.53.17]) by eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0O85008BCI6FXK50@eusync1.samsung.com>; Thu, 02 Jun 2016 16:40:36 +0100 (BST) From: Krzysztof Kozlowski To: Richard Henderson , Ivan Kokshaysky , Matt Turner , Vineet Gupta , Russell King , Stefano Stabellini , Catalin Marinas , Will Deacon , Haavard Skinnemoen , Hans-Christian Egtvedt , Steven Miao , Mark Salter , Aurelien Jacquiot , Mikael Starvik , Jesper Nilsson , Yoshinori Sato , Richard Kuo , Tony Luck , Fenghua Yu , Konrad Rzeszutek Wilk , Geert Uytterhoeven , James Hogan , Michal Simek , Ralf Baechle , David Howells , Ley Foon Tan , Jonas Bonn , "James E.J. Bottomley" , Helge Deller , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Arnd Bergmann , Olof Johansson , Geoff Levand , Martin Schwidefsky , Guan Xuetao , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, Boris Ostrovsky , David Vrabel , Juergen Gross , Muli Ben-Yehuda , Bjorn Helgaas , David Airlie , Joerg Roedel , David Woodhouse , Andrew Morton , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-alpha@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-arm-kernel@lists.infradead.org, xen-devel@lists.xenproject.org, adi-buildroot-devel@lists.sourceforge.net, linux-c6x-dev@linux-c6x.org, linux-cris-kernel@axis.com, uclinux-h8-devel@lists.sourceforge.jp, linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-metag@vger.kernel.org, linux-mips@linux-mips.org, linux-am33-list@redhat.com, nios2-dev@lists.rocketboards.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, discuss@x86-64.org, linux-pci@vger.kernel.org, linux-xtensa@linux-xtensa.org, dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-rockchip@lists.infradead.org, linux-rdma@vger.kernel.org, iommu@lists.linux-foundation.org, linux-media@vger.kernel.org, linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org Subject: [RFC v3 04/45] arc: dma-mapping: Use unsigned long for dma_attrs Date: Thu, 02 Jun 2016 17:39:06 +0200 Message-id: <1464881987-13203-5-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1464881987-13203-1-git-send-email-k.kozlowski@samsung.com> References: <1464881987-13203-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAAzWSfUxTZxTG9973flFXc1NRryzOpYkxsoyJGnPwK9tfvFs0krkMY6Kug5tC pEhaa3AaU2HAUMBLGcgKa1A6KAiUj/gBhJFWBQFRGxxT5MMBoojQYoYSYGUtZP/9zvM8J+fk 5PBY1c+E8PGJJyV9oiZBzSroLl97z2fGg1HRWy5d5iGzcZ6D9loTC9kPOigodlSx8K+5jYO6 QgcD3pQ0DLaUOHBfTqPBU5aFoNy+H4bePkMwlTJPg2/yDYbHMx4WcivyMFysGeYgveBLKH7Z jWCsr4UC2/hecD55x0GXfJWCgrq1MDuT6m/srMNQ0roLpqyvMAzVVDLw0mXBUPx0Kyz86qUg s6iWg4lX4VBW+gLBC7mfhamBOwgsrQM01I/0MpDb2s3BnSKZAvu1GgxX0m003MvxMuD56RYL 3p+nGOhpKmahfLQaQ1btdX+Z6g5slUGDnG/moMh2iYbhzkcUdFvbWRhzZdPw9vkiBvlKKobC h3/477HwC4a0/moKKrqrOXDltyCYf+9jvjhMRp1WiqS1yCypslYh0tPrxmR+zozIXzVRZCJP 9ks52RRxDrtYcnXcRJNGywBHvNNHSUm9kRTl9yKS1XgfkQZ7aNSOw4rdsVJC/ClJ//ne7xVx mfdnqaQnyuQbt+2sCRWuuICCeFHYLnrsrewyrxEfDTr8rOBVwu9ItJhnccBQCecp0VdGAswK 28SGcttSKFioE0XTiHsphIWz4nj7HLqAeH6V8JVov7k9INPCRvHPHN9SRClEiiWFPfTysI/F jrY8JsBBAhFtjgp6eVak6E5tYGSkLEEfVKLVkjEmyfCDVhceZtDoDMZEbVjMCV09Wv65f26h 0radLiTwSP2h0r75QLSK0ZwynNa5kMhjdbAyfX9UtEoZqzn9o6Q/cUxvTJAMLvQRT6vXKn9r 8nyrErSak9JxSUqS9P+7FB8UYkIrTfoF+e/J2EWn+9OBzNj06VE6ZM3MusWxvsrI63t0d8/p u2JyQ/PWR6wMfr0xYkOYNjm4aVfz174byd/si1CUxvdZY6YPTRzxah2jgxkdHu6g5bvH58BV PXSGfT02uGeD3Zi8O+OT5unJA843cZP7zkYWmOuzVjSPHJ3rnFvYpKtU04Y4TXgo1hs0/wGN R3eybwMAAA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160602_084051_879148_2BB7BE0D X-CRM114-Status: GOOD ( 15.80 ) X-Mailman-Approved-At: Fri, 10 Jun 2016 16:37:14 -0700 X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: hch@infradead.org, Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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;