Message ID | 1464881987-13203-43-git-send-email-k.kozlowski@samsung.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org> 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 <patchwork-linux-rockchip@patchwork.kernel.org>; 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 <patchwork-linux-rockchip@patchwork.kernel.org>; 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 <patchwork-linux-rockchip@patchwork.kernel.org>; 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 <k.kozlowski@samsung.com> To: Richard Henderson <rth@twiddle.net>, Ivan Kokshaysky <ink@jurassic.park.msu.ru>, Matt Turner <mattst88@gmail.com>, Vineet Gupta <vgupta@synopsys.com>, Russell King <linux@armlinux.org.uk>, Stefano Stabellini <sstabellini@kernel.org>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, Haavard Skinnemoen <hskinnemoen@gmail.com>, Hans-Christian Egtvedt <egtvedt@samfundet.no>, Steven Miao <realmz6@gmail.com>, Mark Salter <msalter@redhat.com>, Aurelien Jacquiot <a-jacquiot@ti.com>, Mikael Starvik <starvik@axis.com>, Jesper Nilsson <jesper.nilsson@axis.com>, Yoshinori Sato <ysato@users.sourceforge.jp>, Richard Kuo <rkuo@codeaurora.org>, Tony Luck <tony.luck@intel.com>, Fenghua Yu <fenghua.yu@intel.com>, Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>, Geert Uytterhoeven <geert@linux-m68k.org>, James Hogan <james.hogan@imgtec.com>, Michal Simek <monstr@monstr.eu>, Ralf Baechle <ralf@linux-mips.org>, David Howells <dhowells@redhat.com>, Ley Foon Tan <lftan@altera.com>, Jonas Bonn <jonas@southpole.se>, "James E.J. Bottomley" <jejb@parisc-linux.org>, Helge Deller <deller@gmx.de>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Paul Mackerras <paulus@samba.org>, Michael Ellerman <mpe@ellerman.id.au>, Arnd Bergmann <arnd@arndb.de>, Olof Johansson <olof@lixom.net>, Geoff Levand <geoff@infradead.org>, Martin Schwidefsky <schwidefsky@de.ibm.com>, Guan Xuetao <gxt@mprc.pku.edu.cn>, Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>, x86@kernel.org, Boris Ostrovsky <boris.ostrovsky@oracle.com>, David Vrabel <david.vrabel@citrix.com>, Juergen Gross <jgross@suse.com>, Muli Ben-Yehuda <muli@il.ibm.com>, Bjorn Helgaas <bhelgaas@google.com>, David Airlie <airlied@linux.ie>, Joerg Roedel <joro@8bytes.org>, David Woodhouse <dwmw2@infradead.org>, Andrew Morton <akpm@linux-foundation.org>, 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 <linux-rockchip.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-rockchip>, <mailto:linux-rockchip-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-rockchip/> List-Post: <mailto:linux-rockchip@lists.infradead.org> List-Help: <mailto:linux-rockchip-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-rockchip>, <mailto:linux-rockchip-request@lists.infradead.org?subject=subscribe> Cc: hch@infradead.org, Krzysztof Kozlowski <k.kozlowski@samsung.com>, Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-rockchip" <linux-rockchip-bounces@lists.infradead.org> Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP |
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); }
Split out subsystem specific changes for easier reviews. This will be squashed with main commit. Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> --- arch/unicore32/mm/dma-swiotlb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)