From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752003AbcF3I1G (ORCPT ); Thu, 30 Jun 2016 04:27:06 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:47525 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751757AbcF3I1C (ORCPT ); Thu, 30 Jun 2016 04:27:02 -0400 X-AuditID: cbfec7f5-f792a6d000001302-33-5774d7d3060d From: Krzysztof Kozlowski To: Andrew Morton Cc: linux-kernel@vger.kernel.org, hch@infradead.org, Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , Vineet Gupta , linux-snps-arc@lists.infradead.org Subject: [PATCH v5 03/44] arc: dma-mapping: Use unsigned long for dma_attrs Date: Thu, 30 Jun 2016 10:25:30 +0200 Message-id: <1467275171-6298-3-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1467275171-6298-1-git-send-email-k.kozlowski@samsung.com> References: <1467275019-30789-1-git-send-email-k.kozlowski@samsung.com> <1467275171-6298-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprGLMWRmVeSWpSXmKPExsVy+t/xK7qXr5eEG0yYbmAxZ/0aNouNM9az WpyesIjJ4vULQ4vLu+awWbTeWctkcWjrIxYHdo/NK7Q8Tsz4zeKxeUm9R9+WVYweW/Z/ZvT4 vEkugC2KyyYlNSezLLVI3y6BK2N7m0DBRL6KrkWb2RsYT3J3MXJySAiYSFxquMQIYYtJXLi3 nq2LkYtDSGApo8T9w69YIJxGJomLbUuZQarYBIwlNi9fwgZiiwjoSqx6vosZpIhZ4BmjxLnD k8GKhAW8Jc5cawYrYhFQlbi/ezqYzSvgJrH26BWodXISJ49NZu1i5ODgFHCXmP3dH2JZC6PE sX2TmCcw8i5gZFjFKJpamlxQnJSea6RXnJhbXJqXrpecn7uJERJaX3cwLj1mdYhRgINRiYfX gbkkXIg1say4MvcQowQHs5II7/YrQCHelMTKqtSi/Pii0pzU4kOM0hwsSuK8M3e9DxESSE8s Sc1OTS1ILYLJMnFwSjUw1l9/daH7QsFF/56ccLYJrL+Tiz05PgcZpG5fc80ysrg+YybP3B+f Laa42/9gv2CW/cPpeTnTuSlxKxn3NK1mmM3BcX7mBz7mFLffHXeuav9bHnEkwGn2QttvC+x+ S386NYnrCluuR0RtuH3gRTEFt4gStT3mmREhD/87Bu2VdHeLCJsvOCtMiaU4I9FQi7moOBEA desWYSkCAAA= 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 arc] Acked-by: Vineet Gupta --- arch/arc/mm/dma.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arc/mm/dma.c b/arch/arc/mm/dma.c index 73d7e4c75b7d..3d1f467d1792 100644 --- a/arch/arc/mm/dma.c +++ b/arch/arc/mm/dma.c @@ -22,7 +22,7 @@ static void *arc_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 order = get_order(size); struct page *page; @@ -90,7 +90,7 @@ static void *arc_dma_alloc(struct device *dev, size_t size, } static void arc_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 page *page = virt_to_page(dma_handle); int is_non_coh = 1; @@ -129,7 +129,7 @@ static void _dma_cache_sync(phys_addr_t paddr, size_t size, static dma_addr_t arc_dma_map_page(struct device *dev, struct page *page, unsigned long offset, size_t size, enum dma_data_direction dir, - struct dma_attrs *attrs) + unsigned long attrs) { phys_addr_t paddr = page_to_phys(page) + offset; _dma_cache_sync(paddr, size, dir); @@ -137,7 +137,7 @@ static dma_addr_t arc_dma_map_page(struct device *dev, struct page *page, } static int arc_dma_map_sg(struct device *dev, struct scatterlist *sg, - int nents, enum dma_data_direction dir, struct dma_attrs *attrs) + int nents, enum dma_data_direction dir, unsigned long attrs) { struct scatterlist *s; int i; -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: k.kozlowski@samsung.com (Krzysztof Kozlowski) Date: Thu, 30 Jun 2016 10:25:30 +0200 Subject: [PATCH v5 03/44] arc: dma-mapping: Use unsigned long for dma_attrs In-Reply-To: <1467275171-6298-1-git-send-email-k.kozlowski@samsung.com> References: <1467275019-30789-1-git-send-email-k.kozlowski@samsung.com> <1467275171-6298-1-git-send-email-k.kozlowski@samsung.com> List-ID: Message-ID: <1467275171-6298-3-git-send-email-k.kozlowski@samsung.com> To: linux-snps-arc@lists.infradead.org Split out subsystem specific changes for easier reviews. This will be squashed with main commit. Signed-off-by: Krzysztof Kozlowski [for arc] Acked-by: Vineet Gupta --- arch/arc/mm/dma.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arc/mm/dma.c b/arch/arc/mm/dma.c index 73d7e4c75b7d..3d1f467d1792 100644 --- a/arch/arc/mm/dma.c +++ b/arch/arc/mm/dma.c @@ -22,7 +22,7 @@ static void *arc_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 order = get_order(size); struct page *page; @@ -90,7 +90,7 @@ static void *arc_dma_alloc(struct device *dev, size_t size, } static void arc_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 page *page = virt_to_page(dma_handle); int is_non_coh = 1; @@ -129,7 +129,7 @@ static void _dma_cache_sync(phys_addr_t paddr, size_t size, static dma_addr_t arc_dma_map_page(struct device *dev, struct page *page, unsigned long offset, size_t size, enum dma_data_direction dir, - struct dma_attrs *attrs) + unsigned long attrs) { phys_addr_t paddr = page_to_phys(page) + offset; _dma_cache_sync(paddr, size, dir); @@ -137,7 +137,7 @@ static dma_addr_t arc_dma_map_page(struct device *dev, struct page *page, } static int arc_dma_map_sg(struct device *dev, struct scatterlist *sg, - int nents, enum dma_data_direction dir, struct dma_attrs *attrs) + int nents, enum dma_data_direction dir, unsigned long attrs) { struct scatterlist *s; int i; -- 1.9.1