From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161162AbcFJKN4 (ORCPT ); Fri, 10 Jun 2016 06:13:56 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:12740 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161119AbcFJKNv (ORCPT ); Fri, 10 Jun 2016 06:13:51 -0400 X-AuditID: cbfec7f5-f792a6d000001302-d1-575a92dde9f9 From: Krzysztof Kozlowski To: Andrew Morton Cc: hch@infradead.org, Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , David Howells , linux-am33-list@redhat.com, linux-kernel@vger.kernel.org Subject: [PATCH v4 32/44] mn10300: dma-mapping: Use unsigned long for dma_attrs Date: Fri, 10 Jun 2016 12:11:49 +0200 Message-id: <1465553521-27303-33-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+NgFprELMWRmVeSWpSXmKPExsVy+t/xa7p3J0WFG/TMULWYs34Nm8XGGetZ Ld41/WaxOD1hEZPF6xeGFrP232WxuLxrDpsDu8fmFVoeJ2b8ZvF4v+8qm0ffllWMHp83yQWw RnHZpKTmZJalFunbJXBlvL31mrHgLm/FrzXrmBoYV3B3MXJySAiYSHz6tYoJwhaTuHBvPVsX IxeHkMBSRomZuw4yQTiNTBI7mm+AVbEJGEtsXr6EDcQWEdCVWPV8FzNIEbPAfUaJthcTGEES wgL+Eh07n7N0MXJwsAioSpz44QcS5hXwkLi0so0ZYpucxMljk1lBbE6gePfdmSwgtpCAu8T2 J6+YJjDyLmBkWMUomlqaXFCclJ5rpFecmFtcmpeul5yfu4kRElJfdzAuPWZ1iFGAg1GJhzdi V2S4EGtiWXFl7iFGCQ5mJRFei76ocCHelMTKqtSi/Pii0pzU4kOM0hwsSuK8M3e9DxESSE8s Sc1OTS1ILYLJMnFwSjUw5pYHTqh/mvWpT+JI7/l5W+v87rOuvP+eSeWqxCfXTV28j7/W3oj+ kBa9msEx+8HpPWdML3FHzVXbXZwiI37ohoGw6clbU/Ltrir5bpY7o6wdGCC4m9kkPuhvXeW0 w8Zz5e6t5Xa6uva/6fH9hxY83H8wxnaLuUlDhf/P0uqGFXUSvUvqNj8yVWIpzkg01GIuKk4E ALlEhlUlAgAA 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/mn10300/mm/dma-alloc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/mn10300/mm/dma-alloc.c b/arch/mn10300/mm/dma-alloc.c index 8842394cb49a..4f4b9029f0ea 100644 --- a/arch/mn10300/mm/dma-alloc.c +++ b/arch/mn10300/mm/dma-alloc.c @@ -21,7 +21,7 @@ static unsigned long pci_sram_allocated = 0xbc000000; static void *mn10300_dma_alloc(struct device *dev, size_t size, - dma_addr_t *dma_handle, gfp_t gfp, struct dma_attrs *attrs) + dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs) { unsigned long addr; void *ret; @@ -63,7 +63,7 @@ done: } static void mn10300_dma_free(struct device *dev, size_t size, void *vaddr, - dma_addr_t dma_handle, struct dma_attrs *attrs) + dma_addr_t dma_handle, unsigned long attrs) { unsigned long addr = (unsigned long) vaddr & ~0x20000000; @@ -75,7 +75,7 @@ static void mn10300_dma_free(struct device *dev, size_t size, void *vaddr, static int mn10300_dma_map_sg(struct device *dev, struct scatterlist *sglist, int nents, enum dma_data_direction direction, - struct dma_attrs *attrs) + unsigned long attrs) { struct scatterlist *sg; int i; @@ -92,7 +92,7 @@ static int mn10300_dma_map_sg(struct device *dev, struct scatterlist *sglist, static dma_addr_t mn10300_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) { return page_to_bus(page) + offset; } -- 1.9.1