From patchwork Wed Jul 13 08:41:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 9227209 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 160446075D for ; Wed, 13 Jul 2016 08:49:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 07486272AA for ; Wed, 13 Jul 2016 08:49:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F019427BFA; Wed, 13 Jul 2016 08:49:31 +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=ham 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 4008E272AA for ; Wed, 13 Jul 2016 08:49:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752951AbcGMIs7 (ORCPT ); Wed, 13 Jul 2016 04:48:59 -0400 Received: from mailout3.w1.samsung.com ([210.118.77.13]:55625 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932113AbcGMInC (ORCPT ); Wed, 13 Jul 2016 04:43:02 -0400 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OA800HCKW6XK530@mailout3.w1.samsung.com>; Wed, 13 Jul 2016 09:42:33 +0100 (BST) X-AuditID: cbfec7f4-f796c6d000001486-e6-5785fef9cb8e Received: from eusync3.samsung.com ( [203.254.199.213]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id 6A.B0.05254.9FEF5875; Wed, 13 Jul 2016 09:42:33 +0100 (BST) Received: from AMDC2174.DIGITAL.local ([106.120.53.17]) by eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OA800KINW5J0E10@eusync3.samsung.com>; Wed, 13 Jul 2016 09:42:33 +0100 (BST) From: Krzysztof Kozlowski To: Andrew Morton Cc: linux-kernel@vger.kernel.org, hch@infradead.org, Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , Yoshinori Sato , Rich Felker , linux-sh@vger.kernel.org Subject: [PATCH v6 39/46] sh: dma-mapping: Use unsigned long for dma_attrs Date: Wed, 13 Jul 2016 10:41:30 +0200 Message-id: <1468399300-5399-39-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1468399300-5399-38-git-send-email-k.kozlowski@samsung.com> References: <1468399167-28083-1-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-1-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-2-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-3-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-4-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-5-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-6-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-7-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-8-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-9-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-10-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-11-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-12-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-13-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-14-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-15-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-16-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-17-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-18-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-19-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-20-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-21-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-22-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-23-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-24-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-25-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-26-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-27-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-28-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-29-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-30-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-31-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-32-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-33-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-34-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-35-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-36-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-37-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-38-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprLLMWRmVeSWpSXmKPExsVy+t/xq7o//7WGG7Tt4LCYs34Nm8XGGetZ LRb+/MVqcXrCIiaL1y8MLS7vmsNmMefPFGaL+5P2MjlweGxeoeVxbvYHFo8TM36zePRtWcXo sWTrTUaPz5vkAtiiuGxSUnMyy1KL9O0SuDLWzt7JVPBTpOLa9F/sDYxvBboYOTkkBEwknm/Y wAphi0lcuLeerYuRi0NIYCmjxOZdM6CcRiaJ2Ysfs4NUsQkYS2xevoQNxBYR0JVY9XwXM0gR s0Abk8SCxWfBRgkLeElcvP+ACcRmEVCVWHRoIlARBwevgLvE+cOKENvkJE4emwxWzingITFz xV4WiGWfhCT+ne9jn8DIu4CRYRWjaGppckFxUnquoV5xYm5xaV66XnJ+7iZGSKB92cG4+JjV IUYBDkYlHl5GkdZwIdbEsuLK3EOMEhzMSiK8T/8ChXhTEiurUovy44tKc1KLDzFKc7AoifPO 3fU+REggPbEkNTs1tSC1CCbLxMEp1cBo/LqkpaJAkWPOh0XqIqY+CxYt48++6vZW9OcXo4Ve EU/l5D+3XC07vdLsSGnO9b3b1TgfVfIVdHx2+tX1bdY33biuP7d61t7Pq3h/2mP1/3RJ7Zm6 /0SeadWsuOtl9O1fjOnPIue9+24eK579fL3JrC/XeB1EDqi9Cbar1L11acbn3gMaBbMllFiK MxINtZiLihMB775qOjACAAA= 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;