From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753198AbcGMIxk (ORCPT ); Wed, 13 Jul 2016 04:53:40 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:21825 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752814AbcGMImS (ORCPT ); Wed, 13 Jul 2016 04:42:18 -0400 X-AuditID: cbfec7f4-f796c6d000001486-46-5785feda31ff From: Krzysztof Kozlowski To: Andrew Morton Cc: linux-kernel@vger.kernel.org, hch@infradead.org, Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , Haavard Skinnemoen , Hans-Christian Egtvedt Subject: [PATCH v6 07/46] avr32: dma-mapping: Use unsigned long for dma_attrs Date: Wed, 13 Jul 2016 10:40:58 +0200 Message-id: <1468399300-5399-7-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1468399300-5399-6-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> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprBLMWRmVeSWpSXmKPExsVy+t/xq7q3/rWGG6z4bmAxZ/0aNouNM9az WnSve8RucXrCIiaLH1+bWSxevzC0uLxrDpsDu8fOWXfZPTav0PI4MeM3i8eiU5/ZPfq2rGL0 +LxJLoAtissmJTUnsyy1SN8ugSvjeKNhwSG+iie/jjE1MDbwdDFyckgImEh8Xf2VFcIWk7hw bz1bFyMXh5DAUkaJ6esOQTmNTBKr3h1jA6liEzCW2Lx8CZgtIqArser5LmaQImaB34wSm/7s YwJJCAv4Sqw58JcRxGYRUJVoO76PHcTmFXCTuNsxlQVinZzEyWOTwVZzCrhLzPi1hxVi21Zm iWVP3rJMYORdwMiwilE0tTS5oDgpPddQrzgxt7g0L10vOT93EyMkvL7sYFx8zOoQowAHoxIP L6NIa7gQa2JZcWXuIUYJDmYlEd6nf4FCvCmJlVWpRfnxRaU5qcWHGKU5WJTEeefueh8iJJCe WJKanZpakFoEk2Xi4JRqYLRh4muIee+icDq9+QOzavKN7LKXWzQXTUl7nb9Kxz2wxmNx6Qf+ 7OcOFmuyz9xl47T9EsFy9J1PqoJRVrTuyZXyl39GK2x62Xos1VrhrVRM1yOeF/cNRfpW75gv +WvOfPGbDPPLJLYqPVSfn7s107YzRya7/kro5VPlvJVPbwvNVwi5LMIdpsRSnJFoqMVcVJwI AASLXPcrAgAA 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 [for avr32] 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; -- 1.9.1