From patchwork Thu Jun 2 15:39:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 9170817 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 E3942607D9 for ; Fri, 10 Jun 2016 23:38:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D3DFF28210 for ; Fri, 10 Jun 2016 23:38:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C81402833F; Fri, 10 Jun 2016 23:38:35 +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 8BBED28210 for ; Fri, 10 Jun 2016 23:38:35 +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 1bBW0Y-0005Hv-76; Fri, 10 Jun 2016 23:38:34 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b8Uli-0003MF-ED; Thu, 02 Jun 2016 15:42:46 +0000 Received: from mailout3.w1.samsung.com ([210.118.77.13]) by merlin.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1b8Ulh-0003Cb-F7; Thu, 02 Jun 2016 15:42:45 +0000 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0O85008N2IAYD710@mailout3.w1.samsung.com>; Thu, 02 Jun 2016 16:42:35 +0100 (BST) X-AuditID: cbfec7f4-f796c6d000001486-21-575053ea74b5 Received: from eusync1.samsung.com ( [203.254.199.211]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id 9E.9A.05254.AE350575; Thu, 2 Jun 2016 16:42:34 +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:42:34 +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 42/45] unicore32: dma-mapping: Use unsigned long for dma_attrs Date: Thu, 02 Jun 2016 17:39:44 +0200 Message-id: <1464881987-13203-43-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: H4sIAAAAAAAAAzWSfUxTZxTGee/73g+IxZvq8AYTkzVOoxkqui0nujQzLvHOj9lMEhL/2Fbq TUsGSHrBzX2lgjBFYBcqirQjiFWKg/I1M3AyQm0AxToaFuamFYOgMBW6ToG0wNbC9t/vPM9z ck5ODofVD+hELj0rRzJn6TM0TBzpX+gdTPrzoC51S6FnOZzqCLPQ22xhoOTOTQrsTQ0MzJf3 sNBS2URDIK8AgyPPBL5zBQSmLhcjqHPuh+HgPQSTeWECC8+fYfj15RQDZfVWDKddIywUnt0J 9ideBI//6KTAMaGF7rvTLPQrtRScbVkFsy/zI423WjDUdO2AyepxDMOuKzQ8cVdhsP++FebO Byg4ZWtm4el4Mly+OIZgTLnPwKTfg6Cqy0+g9dEQDWVdXhY8NoUC5/cuDBcKHQT6SgM0TJ1o ZyBwcpKGwWt2BupGGzEUN1+NlPm+6FbfEFAqylmwOb4lMHJrgAJvdS8Dj90lBIIP/8GgXMjH UPnLz5F7zJ3BUHC/kYJ6byML7opOBOGZBfqdQ+JodzUlFnQqjNhQ3YDEwSEfFsOhciT+5tKJ T61KRCotocTuETcj1k5YiNhR5WfFwF8fijWtuaKtYgiJxR23kdjm3Kh761Dc24eljPSjknmz 9uM4kzPYR7Jn2c+mfwiwFtTGFKFYTuDfELpDVf9xgjDwoCnCcZyav4SEjmkvWSqOU0Lx3z/i aIrhtwltdY7F1Eq+RRAsj3yLBua/FCZ6QyjKK/gDwtU8P4ky4V8T/KdHFzMqXhSstXayNG6N cLPHSkc5NqI7muoXdTW/W/Dlt9EKUtWgmCvoFSnXkC2nGTOTN8n6TDk3y7jJcCSzFS193Yt2 dLFnuxvxHNIsUzk3HEhV0/qj8rFMNxI4rFmpyvlAl6pWHdYf+1wyH/nInJshyW60miOaVarv rk2lqHmjPkf6RJKyJfP/LsXFJlqQbViu9BjjB7RJ6764Hf9eyvOde8pTXD2O2VCwj5v1mO6G J+6N7y9Vlq8pSoh/eKPelTOqizeEjI4ZazpHvR84EXNDSxL3fbpjd9FX7XdiktYlydtHVrxe lrbr+vxYdnDbpZl31zrnv1alvbnZNNcf+Gn8VdPeEvuGhPMNhhdbDdr1GiKb9MkbsVnW/wuE XvAtcQMAAA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160602_114245_585989_86409F56 X-CRM114-Status: GOOD ( 19.70 ) X-Mailman-Approved-At: Fri, 10 Jun 2016 16:37:15 -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/unicore32/mm/dma-swiotlb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/unicore32/mm/dma-swiotlb.c b/arch/unicore32/mm/dma-swiotlb.c index 16c08b2143a7..3e9f6489ba38 100644 --- a/arch/unicore32/mm/dma-swiotlb.c +++ b/arch/unicore32/mm/dma-swiotlb.c @@ -19,14 +19,14 @@ static void *unicore_swiotlb_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flags, - struct dma_attrs *attrs) + unsigned long attrs) { return swiotlb_alloc_coherent(dev, size, dma_handle, flags); } static void unicore_swiotlb_free_coherent(struct device *dev, size_t size, void *vaddr, dma_addr_t dma_addr, - struct dma_attrs *attrs) + unsigned long attrs) { swiotlb_free_coherent(dev, size, vaddr, dma_addr); }