From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932119AbcF3I3Q (ORCPT ); Thu, 30 Jun 2016 04:29:16 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:54240 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752448AbcF3I3F (ORCPT ); Thu, 30 Jun 2016 04:29:05 -0400 X-AuditID: cbfec7f5-f792a6d000001302-a6-5774d816479b From: Krzysztof Kozlowski To: Andrew Morton Cc: linux-kernel@vger.kernel.org, hch@infradead.org, Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , Yoshinori Sato , uclinux-h8-devel@lists.sourceforge.jp Subject: [PATCH v5 25/44] h8300: dma-mapping: Use unsigned long for dma_attrs Date: Thu, 30 Jun 2016 10:25:52 +0200 Message-id: <1467275171-6298-25-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1467275171-6298-1-git-send-email-k.kozlowski@samsung.com> References: <1467275019-30789-1-git-send-email-k.kozlowski@samsung.com> <1467275171-6298-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprGLMWRmVeSWpSXmKPExsVy+t/xK7piN0rCDVb857eYs34Nm8XGGetZ LU5PWMRk8fqFocXlXXPYLLaefs9scX/SXiYHdo/NK7Q8Tsz4zeKx/dNORo++LasYPZZsvcno 8XmTXABbFJdNSmpOZllqkb5dAlfGsjdrWAvecFe8edXB0sA4i7OLkZNDQsBEYuvKEywQtpjE hXvr2UBsIYGljBJzl1V2MXIB2Y1MEmumvWIESbAJGEtsXr4ErEhEQFdi1fNdzCBFzAJfGCV+ bj3DBJIQFvCVmPKnjb2LkYODRUBV4swMA5Awr4C7xLSXB5kglslJnDw2mRWkhBMoPvu7P8Su FkaJY/smMU9g5F3AyLCKUTS1NLmgOCk910ivODG3uDQvXS85P3cTIyS0vu5gXHrM6hCjAAej Eg+vA3NJuBBrYllxZe4hRgkOZiUR3u1XgEK8KYmVValF+fFFpTmpxYcYpTlYlMR5Z+56HyIk kJ5YkpqdmlqQWgSTZeLglGpg1HQMf/PCmNv985aDfY1Z8gIbXrxj+f/apdlf9Y+p7A6Nxzu4 t36d/GFKR+6shMQUv6LrAe/aj4XrrpZ+eU/FrqfcYJn17jL1c1tCrtaJ3tx+7M0ysXf3hL8e 3SXNyHA7JulWYetpk0TPSUtE9PqK08tnVxmXcu5OeJx8/chTsXV+b/OjzFujlViKMxINtZiL ihMBSXUU+CkCAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Split out subsystem specific changes for easier reviews. This will be squashed with main commit. Signed-off-by: Krzysztof Kozlowski --- arch/h8300/kernel/dma.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/h8300/kernel/dma.c b/arch/h8300/kernel/dma.c index eeb13d3f2424..3651da045806 100644 --- a/arch/h8300/kernel/dma.c +++ b/arch/h8300/kernel/dma.c @@ -12,7 +12,7 @@ static void *dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t gfp, - struct dma_attrs *attrs) + unsigned long attrs) { void *ret; @@ -32,7 +32,7 @@ static void *dma_alloc(struct device *dev, size_t size, static void dma_free(struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle, - struct dma_attrs *attrs) + unsigned long attrs) { free_pages((unsigned long)vaddr, get_order(size)); @@ -41,14 +41,14 @@ static void dma_free(struct device *dev, size_t size, static dma_addr_t map_page(struct device *dev, struct page *page, unsigned long offset, size_t size, enum dma_data_direction direction, - struct dma_attrs *attrs) + unsigned long attrs) { return page_to_phys(page) + offset; } static int map_sg(struct device *dev, struct scatterlist *sgl, int nents, enum dma_data_direction direction, - struct dma_attrs *attrs) + unsigned long attrs) { struct scatterlist *sg; int i; -- 1.9.1