From patchwork Thu Jun 2 15:39:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 629514 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rLMGY08Kgz9t8L for ; Fri, 3 Jun 2016 08:24:37 +1000 (AEST) Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3rLMGX4ZZKzDsnP for ; Fri, 3 Jun 2016 08:24:36 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mailout4.w1.samsung.com (mailout4.w1.samsung.com [210.118.77.14]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3rLBLB3YlXzDqgj for ; Fri, 3 Jun 2016 01:42:10 +1000 (AEST) 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 <0O8500CB0IA6Z110@mailout4.w1.samsung.com> for linuxppc-dev@lists.ozlabs.org; Thu, 02 Jun 2016 16:42:07 +0100 (BST) X-AuditID: cbfec7f4-f796c6d000001486-d4-575053cef269 Received: from eusync1.samsung.com ( [203.254.199.211]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id EF.7A.05254.EC350575; Thu, 2 Jun 2016 16:42:06 +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:06 +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 33/45] mn10300: dma-mapping: Use unsigned long for dma_attrs Date: Thu, 02 Jun 2016 17:39:35 +0200 Message-id: <1464881987-13203-34-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: H4sIAAAAAAAAAzWSbUxTZxTHfe5zXwqs8aaC3FRDYo3LNAEGmu24GSbJEp8vbIwtIWHJoOoN mAFiC2yaJavU4lBwVyoVoWsQqhQthYImQERGh0VF0MrSqbPTgIKI0kp8C1S0Bfftd/7/85aT I8MKH6OU7SosFjWF6nwVG0kPLQyOxo98m5758YWmtVDRPc/BYLuOhaqRKxSY2+wsvKl2c+Cs bWMgUGbAYC3LA89xAw3+05UImm1pcG/2XwQzZfM0LDx9guHvF34WjrYYMRx2jHFQbkoF8+Qw gok7vRRYp1Kg/9ZLDoakRgpMzlh4/UIfKrzqxNDQ9znMWB5huOc4w8Ckqw6D+XYyBE8EKKio b+dg+lESnG56iOChdJeFGd8Agro+Hw0d414GjvYNczBQL1FgO+vAcLLcSsPlIwEG/Ae6WAj8 NsPAaI+ZheYHrRgq28+HQr0nvNVBGqSaag7qrb/TMHb1BgXDlkEWJlxVNMzef4tBOqnHUHv9 YugewWMYDHdbKWgZbuXAVdOLYP7VArM1izzot1DE0CuxxG6xIzLq9WAyP1eNyD+OdDJtlELS kSqK9I+5WNI4paNJd52PI4FnP5CGjhJSX+NFpLL7GiKdtg3pn2RFbtkp5u8qFTWJKTmReU/v TKMin/znObuD0iFb1CEUIRP4TcKQYYBa4pXCjf/a2EMoUqbgTyGho/E5HTYU/H5KeBwsDTPL bxQ6m62LSdG8UxB04x4cNjD/izA1OIfCvIJPE/pPBRd1ml8nmILji43kPBH8l3q5pWlxwhW3 kQlzREi3trW8H7ZN8Og7GQnJG9CyMyhGLNlRpN2eW5CUoFUXaEsKcxN27C7oQEtP97wLNbk/ cyFehlQfyG3rv85UMOpS7d4CFxJkWBUtL85Iz1TId6r37hM1u7M1Jfmi1oVWyWhVrPyPHv93 Cj5XXSz+KIpFouZ/l5JFKHVIfzZ1rX0q0aDQ+6TxzfGvnwhbLMrqm8f1eVu9F7K/8X4Rc1u+ LdlI0m5NOP86WHHz8Z4vx1DGqpzlZv8lkqhcE3fOvT+nRtpOfZj8U3zPyOhXblNK7Uu9+vsV m88bY8rRp31DsRlxJ5Imu7isc9ejotZ9ZFBGK1+ZZtsTUldn//mritbmqZM2YI1W/Q62sYPT cAMAAA== X-Mailman-Approved-At: Fri, 03 Jun 2016 07:44:18 +1000 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: hch@infradead.org, Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Split out subsystem specific changes for easier reviews. This will be squashed with main commit. Signed-off-by: Krzysztof Kozlowski --- arch/mn10300/mm/dma-alloc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/mn10300/mm/dma-alloc.c b/arch/mn10300/mm/dma-alloc.c index 8842394cb49a..4f4b9029f0ea 100644 --- a/arch/mn10300/mm/dma-alloc.c +++ b/arch/mn10300/mm/dma-alloc.c @@ -21,7 +21,7 @@ static unsigned long pci_sram_allocated = 0xbc000000; static void *mn10300_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 addr; void *ret; @@ -63,7 +63,7 @@ done: } static void mn10300_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) { unsigned long addr = (unsigned long) vaddr & ~0x20000000; @@ -75,7 +75,7 @@ static void mn10300_dma_free(struct device *dev, size_t size, void *vaddr, static int mn10300_dma_map_sg(struct device *dev, struct scatterlist *sglist, int nents, enum dma_data_direction direction, - struct dma_attrs *attrs) + unsigned long attrs) { struct scatterlist *sg; int i; @@ -92,7 +92,7 @@ static int mn10300_dma_map_sg(struct device *dev, struct scatterlist *sglist, static dma_addr_t mn10300_dma_map_page(struct device *dev, struct page *page, unsigned long offset, size_t size, - enum dma_data_direction direction, struct dma_attrs *attrs) + enum dma_data_direction direction, unsigned long attrs) { return page_to_bus(page) + offset; }