From patchwork Thu Jun 2 15:39:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 9170761 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 7C39A607D9 for ; Fri, 10 Jun 2016 23:38:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D0FC28210 for ; Fri, 10 Jun 2016 23:38:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 60ABC2833F; Fri, 10 Jun 2016 23:38:19 +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 2069B28210 for ; Fri, 10 Jun 2016 23:38:19 +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 1bBW0I-0004ur-PO; Fri, 10 Jun 2016 23:38:18 +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 1b8Uk1-0001JP-9r; Thu, 02 Jun 2016 15:41:03 +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 <0O85008M2I87TS10@mailout4.w1.samsung.com>; Thu, 02 Jun 2016 16:40:56 +0100 (BST) X-AuditID: cbfec7f4-f796c6d000001486-02-57505387562d Received: from eusync1.samsung.com ( [203.254.199.211]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id 04.2A.05254.78350575; Thu, 2 Jun 2016 16:40:55 +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:55 +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 10/45] cris: dma-mapping: Use unsigned long for dma_attrs Date: Thu, 02 Jun 2016 17:39:12 +0200 Message-id: <1464881987-13203-11-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: H4sIAAAAAAAAAzWSfUxTZxTG9973frWhyV0BudHEP4qGaIKKk+1ENzMTzV6/IokkLM4wq16B SJG0gjJNVkBAJh9XENSCBLRKYVC+oqFEJHSGqgjYsLDpWlAEC3GUamRTULSF+N/veZ5zck5O Do/Vw8xSPinluKRP0SZrWCXdO+8YjMzbGxO3zjkTAfm2OQ4czUYWCvvvU1DZ1MDCh5IeDlou NTHgy8rBYM5KBOfFHBqmbxQgqLXshpHX/yDwZs3RMD/1L4Y/Z6ZZOF9XiuGcdZSD3PItUOnp Q/DiSScF5snN0P33fxz0ylcpKG8Jg7cz2f7GBy0Yqrs2gbdqAsOItZ4Bj92EofLxenh/2UdB fkUzBy8nouDGtXEE47KLBa/7LgJTl5uG1udDDJzv6uPgboVMgeV3K4aaXDMN94p8DEyfaWfB d9bLwGBHJQu1Y40YCppv+mW2M7BVHg1yWQkHFeZiGkYfPKKgr8rBwgt7IQ2vn37EINdkY7g0 cMd/j/cXMOS4Gimo62vkwF7WiWDu/3nm+31krLuKIjmdMksaqhoQGRxyYjI3W4LIX9YY8rJU 9ltFhRTpHrWz5OqkkSY2k5sjvlfxpLo1jVSUDSFSYHuISJtldczX+5TfHpaSk9Il/drNB5SJ ss1Np/YGnXSd8WAjalP+hhS8KGwQz5n62UVeIj4abvKzklcL15FoLc/CiyKTEkeK3uFAFSt8 JbbVmheqQoQWUTQ+dy4EWDgtTjpmUYCDhR1i/mMHFWBaWCnedo0tsEogYv7Nfnpx3HLxfk8p E2CF3zc31S34auEH0ZndxshIVY2+qEehUtqhVMPBBF3UGoNWZ0hLSVhz6JiuFS1+3Zt2dK1n ox0JPNIEqSyr9sSpGW26IUNnRyKPNSGq3N0xcWrVYW3GL5L+2M/6tGTJYEfLeFoTprrSMR2r FhK0x6WjkpQq6T+nFK9YakTk15rtdyLaMwwDp7Zu+1FRbFGkB7u+Sxq/MKyM+qZ42f63mSE/ 5f2RvGdsZ1L4ge1T+yOjQ90d3PXZaE/QUYFXDHRHh5uiuRMlsW+swfVhug/xBacLYz1H6kKf 3FLF347sj59YkUlsU74VEVO95V/Wh2Q2DtvW75p89ir81JFxx16vhjYkaqNWY71B+wl52ieR cQMAAA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160602_084101_732401_25B071C9 X-CRM114-Status: GOOD ( 15.48 ) 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 Acked-by: Jesper Nilsson --- arch/cris/arch-v32/drivers/pci/dma.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/cris/arch-v32/drivers/pci/dma.c b/arch/cris/arch-v32/drivers/pci/dma.c index 8d5efa58cce1..1f0636793f0c 100644 --- a/arch/cris/arch-v32/drivers/pci/dma.c +++ b/arch/cris/arch-v32/drivers/pci/dma.c @@ -17,7 +17,7 @@ #include static void *v32_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) { void *ret; @@ -37,22 +37,21 @@ static void *v32_dma_alloc(struct device *dev, size_t size, } static void v32_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) { free_pages((unsigned long)vaddr, get_order(size)); } static inline dma_addr_t v32_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_phys(page) + offset; } static inline int v32_dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, enum dma_data_direction direction, - struct dma_attrs *attrs) + unsigned long attrs) { printk("Map sg\n"); return nents;