From patchwork Thu Jun 2 15:39:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 9170753 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 A1569607DA for ; Fri, 10 Jun 2016 23:38:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 906ED2824F for ; Fri, 10 Jun 2016 23:38:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 847DD28325; Fri, 10 Jun 2016 23:38:17 +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 424BA2833F for ; Fri, 10 Jun 2016 23:38:17 +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 1bBW0G-0004sz-VL; Fri, 10 Jun 2016 23:38:16 +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 1b8Ujx-0001JP-QR; Thu, 02 Jun 2016 15:40:59 +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 <0O8500AJ6I7YB610@mailout4.w1.samsung.com>; Thu, 02 Jun 2016 16:40:47 +0100 (BST) X-AuditID: cbfec7f4-f796c6d000001486-ec-5750537e2c53 Received: from eusync1.samsung.com ( [203.254.199.211]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id 70.1A.05254.E7350575; Thu, 2 Jun 2016 16:40:46 +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:46 +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 07/45] avr32: dma-mapping: Use unsigned long for dma_attrs Date: Thu, 02 Jun 2016 17:39:09 +0200 Message-id: <1464881987-13203-8-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: H4sIAAAAAAAAAzVSbUxTZxTee9/7BazJtXPzosl+dGERo2zoMo9CnMgyr9nISDQhQbOtkzsw QiEtGCWLqZSyVfkoIBVo1yBUWrS0FEYGZKyjcXTAUDsmm9qKIqIoox0ZzlhFW8n+nefjPOfk 5LBY6qfWsocUxaJSIc+X0bHk2LJ3YtPxvZlZ71rPxYOuP8yAt0tNQ9WlEQJMTjsNz+qGGXA1 OikIlWkxWMrywHdGS0KwvRKB1ZYBU4s3ECyUhUlY/nsewx9LQRpqO+oxnHJMM1BhSAPTvXEE s9cHCbDM7YChvx4xMKZvJcDgWgOPlzSRxlEXhhZ3CiyY72OYcpyn4J6nGYPp2mZ42hQiQGfs YuDh/WRob7uL4K7eT8NC4CKCZneAhO47kxTUuscZuGjUE2C74MBwtsJCwq/VIQqC5X00hL5d oGBiwESDdaYTQ2VXbwRqfNGtviFB31DHgNFSQ8L06BUCxs1eGmY9VSQs3nqOQX9Wg6Hx8k+R ezw9jUHr7ySgY7yTAU/DIILwf8vUzmxhZshMCNpBPS3YzXYkTEz6sBB+UoeEPx2ZwsN6fYSq riKEoWkPLbTOqUmhvznACKF/PhNauksEY8MkEir7f0NCj21D5vvZsak5Yv6hI6LynR1fxOYt NfnJokeSo7pTNlqNBuNOohiW597jL10bQyv1G/yVm076JIplpdw5xNtuu6kVcILg50YnyaiL 5rbwPVbLS9dqzsXz6js+HBUw9zU/530SiWLZ17iP+e9/kURpkkvgmwKLZJSWcLv5xb4PV4a9 yY8M11PROoYTeIuz42W8NGLxaXooPZK0oFfOo9fFkoNFqi9zC5KTVPICVYkiN+lgYUE3Wvm5 f/tQ2/B2D+JYJHtVYkv8NEtKyY+ojhV4EM9i2WpJRUZmllSSIz9WKioLP1eW5IsqD1rHkrI1 ku8GgvukXK68WDwsikWi8n+VYGPWqpGj/O23fsirNtq16Zvdt06PqE940WO7JiXHBNQnjfyD rQmbllJ9rrRea8r88fi2lLSjZt1M9hTeVXrZH26trTKsKnQeSN2omJonDQm69Pbe9HgKfjT2 DsQ1t3Yl/ry7u9yQUXw1ruaj0URXzSxwv3+VVPrBtvWBB6qgQrlnf7qMVOXJkzdgpUr+AuyJ jadvAwAA X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160602_084058_086353_AAC47611 X-CRM114-Status: GOOD ( 15.37 ) 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: Hans-Christian Noren Egtvedt --- arch/avr32/mm/dma-coherent.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/avr32/mm/dma-coherent.c b/arch/avr32/mm/dma-coherent.c index 92cf1fb2b3e6..fc51f4421933 100644 --- a/arch/avr32/mm/dma-coherent.c +++ b/arch/avr32/mm/dma-coherent.c @@ -99,7 +99,7 @@ static void __dma_free(struct device *dev, size_t size, } static void *avr32_dma_alloc(struct device *dev, size_t size, - dma_addr_t *handle, gfp_t gfp, struct dma_attrs *attrs) + dma_addr_t *handle, gfp_t gfp, unsigned long attrs) { struct page *page; dma_addr_t phys; @@ -119,7 +119,7 @@ static void *avr32_dma_alloc(struct device *dev, size_t size, } static void avr32_dma_free(struct device *dev, size_t size, - void *cpu_addr, dma_addr_t handle, struct dma_attrs *attrs) + void *cpu_addr, dma_addr_t handle, unsigned long attrs) { struct page *page; @@ -142,7 +142,7 @@ static void avr32_dma_free(struct device *dev, size_t size, static dma_addr_t avr32_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) { void *cpu_addr = page_address(page) + offset; @@ -152,7 +152,7 @@ static dma_addr_t avr32_dma_map_page(struct device *dev, struct page *page, static int avr32_dma_map_sg(struct device *dev, struct scatterlist *sglist, int nents, enum dma_data_direction direction, - struct dma_attrs *attrs) + unsigned long attrs) { int i; struct scatterlist *sg;