From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932612AbcFJKSX (ORCPT ); Fri, 10 Jun 2016 06:18:23 -0400 Received: from mailout3.w1.samsung.com ([210.118.77.13]:15926 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161096AbcFJKNo (ORCPT ); Fri, 10 Jun 2016 06:13:44 -0400 X-AuditID: cbfec7f5-f792a6d000001302-bc-575a92d72c88 From: Krzysztof Kozlowski To: Andrew Morton Cc: hch@infradead.org, Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , Michal Simek , Max Filippov , Guenter Roeck , Valentin Rothberg , Dan Williams , Jens Axboe , linux-kernel@vger.kernel.org Subject: [PATCH v4 30/44] microblaze: dma-mapping: Use unsigned long for dma_attrs Date: Fri, 10 Jun 2016 12:11:47 +0200 Message-id: <1465553521-27303-31-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+NgFtrJLMWRmVeSWpSXmKPExsVy+t/xa7rXJ0WFG3z9xWMxZ/0aNov/e46x WWycsZ7VYvrUC4wWpycsYrL49nAho8XrF4YWl3fNYbN4svAMk8WTj6dZLD41tzE7cHtMbH7H 7rFz1l12j80rtDwW73nJ5HFixm8Wj79dU5g9dn5vYPfo27KK0ePzJrkAzigum5TUnMyy1CJ9 uwSujBsHFApWiVfs37iRrYFxl1AXIyeHhICJxLWdR1ggbDGJC/fWs3UxcnEICSxllDiyZTIr hNPIJLHjwhJWkCo2AWOJzcuXsIHYIgK6Eque72IGKWIWaGCWuHrzLNgoYYEQialTfgAlODhY BFQlfkwJBAnzCnhIHH1xnQ1im5zEyWOTwWZyAsW7784EaxUScJfY/uQV0wRG3gWMDKsYRVNL kwuKk9JzjfSKE3OLS/PS9ZLzczcxQgL06w7GpcesDjEKcDAq8fBG7IoMF2JNLCuuzD3EKMHB rCTCa9EXFS7Em5JYWZValB9fVJqTWnyIUZqDRUmcd+au9yFCAumJJanZqakFqUUwWSYOTqkG RqPQZ/UClx5d2HKLSXxqj7W5/s63HS+Yj/Wdvzpb96zu87/FE+uaft6rdnv8kos7iVG5sYn3 bn/fA/P9MQEiij1RZ/5s0a3zvmn7TZDtPHPVA7VJqzP3JSW9MZn10un1+frZQjPq20UO6CW9 uZirxDWXYc7Upp4jK9ZP9hc7aCL4oDLAuqVbTYmlOCPRUIu5qDgRANHoNa9MAgAA 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/microblaze/include/asm/dma-mapping.h | 1 - arch/microblaze/kernel/dma.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/arch/microblaze/include/asm/dma-mapping.h b/arch/microblaze/include/asm/dma-mapping.h index 1884783d15c0..1768d4bdc8d3 100644 --- a/arch/microblaze/include/asm/dma-mapping.h +++ b/arch/microblaze/include/asm/dma-mapping.h @@ -25,7 +25,6 @@ #include #include #include -#include #include #include diff --git a/arch/microblaze/kernel/dma.c b/arch/microblaze/kernel/dma.c index bf4dec229437..ec04dc1e2527 100644 --- a/arch/microblaze/kernel/dma.c +++ b/arch/microblaze/kernel/dma.c @@ -17,7 +17,7 @@ static void *dma_direct_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag, - struct dma_attrs *attrs) + unsigned long attrs) { #ifdef NOT_COHERENT_CACHE return consistent_alloc(flag, size, dma_handle); @@ -42,7 +42,7 @@ static void *dma_direct_alloc_coherent(struct device *dev, size_t size, static void dma_direct_free_coherent(struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle, - struct dma_attrs *attrs) + unsigned long attrs) { #ifdef NOT_COHERENT_CACHE consistent_free(size, vaddr); @@ -53,7 +53,7 @@ static void dma_direct_free_coherent(struct device *dev, size_t size, static int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl, int nents, enum dma_data_direction direction, - struct dma_attrs *attrs) + unsigned long attrs) { struct scatterlist *sg; int i; @@ -78,7 +78,7 @@ static inline dma_addr_t dma_direct_map_page(struct device *dev, unsigned long offset, size_t size, enum dma_data_direction direction, - struct dma_attrs *attrs) + unsigned long attrs) { __dma_sync(page_to_phys(page) + offset, size, direction); return page_to_phys(page) + offset; @@ -88,7 +88,7 @@ static inline void dma_direct_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) { /* There is not necessary to do cache cleanup * @@ -157,7 +157,7 @@ dma_direct_sync_sg_for_device(struct device *dev, static int dma_direct_mmap_coherent(struct device *dev, struct vm_area_struct *vma, void *cpu_addr, dma_addr_t handle, size_t size, - struct dma_attrs *attrs) + unsigned long attrs) { #ifdef CONFIG_MMU unsigned long user_count = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; -- 1.9.1