From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161117AbcFJKNq (ORCPT ); Fri, 10 Jun 2016 06:13:46 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:47142 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161088AbcFJKNm (ORCPT ); Fri, 10 Jun 2016 06:13:42 -0400 X-AuditID: cbfec7f4-f796c6d000001486-ad-575a92d4c5fd From: Krzysztof Kozlowski To: Andrew Morton Cc: hch@infradead.org, Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , James Hogan , Hans-Christian Noren Egtvedt , linux-metag@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 29/44] metag: dma-mapping: Use unsigned long for dma_attrs Date: Fri, 10 Jun 2016 12:11:46 +0200 Message-id: <1465553521-27303-30-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+NgFprLLMWRmVeSWpSXmKPExsVy+t/xa7pXJkWFGyxuU7SYs34Nm8XGGetZ LbrXPWK3OD1hEZPFu3kvmC1evzC0uLxrDpvFs1vtLA4cHj07zzB6bF6h5XFixm8Wj0WnPrN7 9G1ZxejxeZNcAFsUl01Kak5mWWqRvl0CV8apzw1MBatFK/q2X2VvYNwj2MXIySEhYCIx+0cD I4QtJnHh3nq2LkYuDiGBpYwS37+uZ4dwGpkkDj86zQpSxSZgLLF5+RI2EFtEQFdi1fNdzCBF zAIzmCS+b13FDpIQFvCVONKziQXEZhFQlfj08DLYCl4BD4mD/W+ZIdbJSZw8NhlsKCdQvPvu TLB6IQF3ie1PXjFNYORdwMiwilE0tTS5oDgpPddQrzgxt7g0L10vOT93EyMk0L7sYFx8zOoQ owAHoxIPb8SuyHAh1sSy4srcQ4wSHMxKIrwWfVHhQrwpiZVVqUX58UWlOanFhxilOViUxHnn 7nofIiSQnliSmp2aWpBaBJNl4uCUamDkuiMY3a61YIdD/lxf7aUndymett5wdcmsvp8SP+cz sW7Z6cd5UWQ5452j+xe/6b/N46li4jypNFO0MDvFVOGWVUfkuwOmCgYvnryf8HDewzC9orWX Yk2k/7U28z1j+NGble3P9Co+SWhJ/tGSf6tO/zs6O61WWzr6sobIgky3w1Hfur2+KE1SYinO SDTUYi4qTgQAOBMKuTACAAA= 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/metag/kernel/dma.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/metag/kernel/dma.c b/arch/metag/kernel/dma.c index e12368d02155..d68f498e82a1 100644 --- a/arch/metag/kernel/dma.c +++ b/arch/metag/kernel/dma.c @@ -172,7 +172,7 @@ out: * virtual and bus address for that space. */ static void *metag_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; struct metag_vm_region *c; @@ -268,7 +268,7 @@ no_page: * free a page as defined by the above mapping. */ static void metag_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) { struct metag_vm_region *c; unsigned long flags, addr; @@ -331,7 +331,7 @@ no_area: static int metag_dma_mmap(struct device *dev, struct vm_area_struct *vma, void *cpu_addr, dma_addr_t dma_addr, size_t size, - struct dma_attrs *attrs) + unsigned long attrs) { unsigned long flags, user_size, kern_size; struct metag_vm_region *c; @@ -482,7 +482,7 @@ static void dma_sync_for_cpu(void *vaddr, size_t size, int dma_direction) static dma_addr_t metag_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) { dma_sync_for_device((void *)(page_to_phys(page) + offset), size, direction); @@ -491,14 +491,14 @@ static dma_addr_t metag_dma_map_page(struct device *dev, struct page *page, static void metag_dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size, enum dma_data_direction direction, - struct dma_attrs *attrs) + unsigned long attrs) { dma_sync_for_cpu(phys_to_virt(dma_address), size, direction); } static int metag_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; @@ -516,7 +516,7 @@ static int metag_dma_map_sg(struct device *dev, struct scatterlist *sglist, static void metag_dma_unmap_sg(struct device *dev, struct scatterlist *sglist, int nhwentries, enum dma_data_direction direction, - struct dma_attrs *attrs) + unsigned long attrs) { struct scatterlist *sg; int i; -- 1.9.1