From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932292AbcFJKMg (ORCPT ); Fri, 10 Jun 2016 06:12:36 -0400 Received: from mailout3.w1.samsung.com ([210.118.77.13]:15843 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753112AbcFJKMd (ORCPT ); Fri, 10 Jun 2016 06:12:33 -0400 X-AuditID: cbfec7f4-f796c6d000001486-7d-575a928fe8ac From: Krzysztof Kozlowski To: Andrew Morton Cc: hch@infradead.org, Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , Haavard Skinnemoen , Hans-Christian Egtvedt , linux-kernel@vger.kernel.org Subject: [PATCH v4 06/44] avr32: dma-mapping: Use unsigned long for dma_attrs Date: Fri, 10 Jun 2016 12:11:23 +0200 Message-id: <1465553521-27303-7-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+NgFprGLMWRmVeSWpSXmKPExsVy+t/xa7r9k6LCDX6sYbeYs34Nm8XGGetZ LbrXPWK3OD1hEZPFj6/NLBavXxhaXN41h82B3WPnrLvsHptXaHmcmPGbxWPRqc/sHn1bVjF6 fN4kF8AWxWWTkpqTWZZapG+XwJVxvNGw4BBfxZNfx5gaGBt4uhg5OCQETCSW/EnsYuQEMsUk Ltxbz9bFyMUhJLCUUaJx5XdWCKeRSWLS+R+sIFVsAsYSm5cvYQOxRQR0JVY938UMUsQs8JNR 4uKz6+wgCWEBX4nn056BNbAIqErM/7wQrIFXwF1i5c42Noh1chInj00Gq+EU8JDovjuTBcQW AqrZ/uQV0wRG3gWMDKsYRVNLkwuKk9JzDfWKE3OLS/PS9ZLzczcxQkLryw7GxcesDjEKcDAq 8fBG7IoMF2JNLCuuzD3EKMHBrCTCa9EXFS7Em5JYWZValB9fVJqTWnyIUZqDRUmcd+6u9yFC AumJJanZqakFqUUwWSYOTqkGxiVLnrrrnrZ/G8qk6/7zh7PfScF9RlPMX3EuepR6pm5n+Cbf sqjJ8llpn17NS/3MWb18qdm9VxOPcZ9YOj+nPfR/05ZlZveNfqx462W9YkV/sZak+o+4Y8mO jlU7bqisX2LBYnslNNQgNG0+x8PbraqPev7I8NsKuBkaXpU9O5fbxu1Al3yyihJLcUaioRZz UXEiAKjtwCgpAgAA 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