From patchwork Fri Jun 10 10:11:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 9169317 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 5FA32604DB for ; Fri, 10 Jun 2016 10:15:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5008028328 for ; Fri, 10 Jun 2016 10:15:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 44CCE28359; Fri, 10 Jun 2016 10:15:59 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C236228328 for ; Fri, 10 Jun 2016 10:15:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752289AbcFJKP1 (ORCPT ); Fri, 10 Jun 2016 06:15:27 -0400 Received: from mailout3.w1.samsung.com ([210.118.77.13]:15963 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161187AbcFJKOE (ORCPT ); Fri, 10 Jun 2016 06:14:04 -0400 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0O8J0086AWFDZM50@mailout3.w1.samsung.com>; Fri, 10 Jun 2016 11:14:02 +0100 (BST) X-AuditID: cbfec7f5-f792a6d000001302-02-575a92e98e96 Received: from eusync4.samsung.com ( [203.254.199.214]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id A8.A3.04866.9E29A575; Fri, 10 Jun 2016 11:14:01 +0100 (BST) Received: from AMDC2174.DIGITAL.local ([106.120.53.17]) by eusync4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0O8J00MI3WC5KUB0@eusync4.samsung.com>; Fri, 10 Jun 2016 11:14:01 +0100 (BST) From: Krzysztof Kozlowski To: Andrew Morton Cc: hch@infradead.org, Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , Yoshinori Sato , Rich Felker , Max Filippov , Valentin Rothberg , Guenter Roeck , linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 38/44] sh: dma-mapping: Use unsigned long for dma_attrs Date: Fri, 10 Jun 2016 12:11:55 +0200 Message-id: <1465553521-27303-39-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1465553521-27303-1-git-send-email-k.kozlowski@samsung.com> References: <1465553521-27303-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrCLMWRmVeSWpSXmKPExsVy+t/xa7ovJ0WFG/xtM7eYs34Nm8XGGetZ LRb+/MVqcXrCIiaLbw8XMlq8fmFocXnXHDaLOX+mMFs8WXiGyeJTcxuzxf1Je5kcuD12zrrL 7rF5hZbHudkfWDxOzPjN4rHzewO7R9+WVYweS7beZPT4vEkugCOKyyYlNSezLLVI3y6BK2Pt 7J1MBT9FKq5N/8XewPhWoIuRg0NCwETi0wfJLkZOIFNM4sK99WxdjFwcQgJLGSVant5nhnAa mSTajk1jAqliEzCW2Lx8CRuILSKgK7Hq+S5mEJtZoJFZYv8jUxBbWMBL4tXRm+wgNouAqsSE aVNYQWxeAQ+J1X9OsEBsk5M4eWwyWJwTKN59dyZYXEjAXWL7k1dMExh5FzAyrGIUTS1NLihO Ss810itOzC0uzUvXS87P3cQICcuvOxiXHrM6xCjAwajEwxuxKzJciDWxrLgy9xCjBAezkgiv RV9UuBBvSmJlVWpRfnxRaU5q8SFGaQ4WJXHembvehwgJpCeWpGanphakFsFkmTg4pRoY45sf NV1bw2jzb1W6RsWH4qAJOaHmsfzuEyalnLp6+rA2G/ecb7YxD1bwe5zzcFa2iFvH8cl118Pk 2u16W1Q5C869W7R3zjSO24wyd/3ecWYX+06eIr5P+F7487SvttvS508o0Zy/aknyeZsgs3ur D/Met+ToCPsX1naYwffulPl3v+//f8VSQ4mlOCPRUIu5qDgRAFaY2OdHAgAA Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.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 --- arch/sh/include/asm/dma-mapping.h | 4 ++-- arch/sh/kernel/dma-nommu.c | 4 ++-- arch/sh/mm/consistent.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/sh/include/asm/dma-mapping.h b/arch/sh/include/asm/dma-mapping.h index e11cf0c8206b..0052ad40e86d 100644 --- a/arch/sh/include/asm/dma-mapping.h +++ b/arch/sh/include/asm/dma-mapping.h @@ -17,9 +17,9 @@ void dma_cache_sync(struct device *dev, void *vaddr, size_t size, /* arch/sh/mm/consistent.c */ extern void *dma_generic_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_addr, gfp_t flag, - struct dma_attrs *attrs); + unsigned long attrs); extern void dma_generic_free_coherent(struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle, - struct dma_attrs *attrs); + unsigned long attrs); #endif /* __ASM_SH_DMA_MAPPING_H */ diff --git a/arch/sh/kernel/dma-nommu.c b/arch/sh/kernel/dma-nommu.c index 5b0bfcda6d0b..eadb669a7329 100644 --- a/arch/sh/kernel/dma-nommu.c +++ b/arch/sh/kernel/dma-nommu.c @@ -13,7 +13,7 @@ static dma_addr_t nommu_map_page(struct device *dev, struct page *page, unsigned long offset, size_t size, enum dma_data_direction dir, - struct dma_attrs *attrs) + unsigned long attrs) { dma_addr_t addr = page_to_phys(page) + offset; @@ -25,7 +25,7 @@ static dma_addr_t nommu_map_page(struct device *dev, struct page *page, static int nommu_map_sg(struct device *dev, struct scatterlist *sg, int nents, enum dma_data_direction dir, - struct dma_attrs *attrs) + unsigned long attrs) { struct scatterlist *s; int i; diff --git a/arch/sh/mm/consistent.c b/arch/sh/mm/consistent.c index b81d9dbf9fef..92b6976fde59 100644 --- a/arch/sh/mm/consistent.c +++ b/arch/sh/mm/consistent.c @@ -34,7 +34,7 @@ fs_initcall(dma_init); void *dma_generic_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t gfp, - struct dma_attrs *attrs) + unsigned long attrs) { void *ret, *ret_nocache; int order = get_order(size); @@ -66,7 +66,7 @@ void *dma_generic_alloc_coherent(struct device *dev, size_t size, void dma_generic_free_coherent(struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle, - struct dma_attrs *attrs) + unsigned long attrs) { int order = get_order(size); unsigned long pfn = dma_handle >> PAGE_SHIFT;