From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932626AbcFJKQL (ORCPT ); Fri, 10 Jun 2016 06:16:11 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:12745 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161165AbcFJKN7 (ORCPT ); Fri, 10 Jun 2016 06:13:59 -0400 X-AuditID: cbfec7f5-f792a6d000001302-da-575a92e08069 From: Krzysztof Kozlowski To: Andrew Morton Cc: hch@infradead.org, Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , Jonas Bonn , Hans-Christian Noren Egtvedt , linux-kernel@vger.kernel.org Subject: [PATCH v4 34/44] openrisc: dma-mapping: Use unsigned long for dma_attrs Date: Fri, 10 Jun 2016 12:11:51 +0200 Message-id: <1465553521-27303-35-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+NgFprKLMWRmVeSWpSXmKPExsVy+t/xa7oPJkWFG3xoVrSYs34Nm8XGGetZ LbrXPWK3OD1hEZPFn5kfmCxevzC0uLxrDpsDu8fmFVoeJ2b8ZvFYdOozu0ffllWMHqd6VjN7 fN4kF8AWxWWTkpqTWZZapG+XwJXx4cFP1oJjYhXf9yxgaWC8IdjFyMEhIWAiMXGVcRcjJ5Ap JnHh3no2EFtIYCmjxJa5tl2MXEB2I5PE3OefWEESbALGEpuXLwErEhHQlVj1fBczSBGzwDdG iZv/z7CAJIQFAiQOv5rPBLKARUBVYtM+A5Awr4CHxJeGS8wQy+QkTh6bDDaTEyjefXcmC8Ri d4ntT14xTWDkXcDIsIpRNLU0uaA4KT3XSK84Mbe4NC9dLzk/dxMjJLC+7mBceszqEKMAB6MS D2/ErshwIdbEsuLK3EOMEhzMSiK8Fn1R4UK8KYmVValF+fFFpTmpxYcYpTlYlMR5Z+56HyIk kJ5YkpqdmlqQWgSTZeLglGpgPOwe6/yY++3qiuhpU85NKmpUlt99+MrJMrk9HLx3lN7UJf4S XKD700M0mP/+mogKXr8bZewOcxYtPnfk7qlp0XzmKvoBjEu3nOEPu3qiVbj2zXzJuXKKSktb 3HI/POu6e5zXPYjfwefxsh1hxvMZo0Lemp5Lz1inFzHvllBbtIyV0C1ji543SizFGYmGWsxF xYkAjNPX8ygCAAA= 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/openrisc/kernel/dma.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/arch/openrisc/kernel/dma.c b/arch/openrisc/kernel/dma.c index 0b77ddb1ee07..50eb1f26c540 100644 --- a/arch/openrisc/kernel/dma.c +++ b/arch/openrisc/kernel/dma.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include @@ -83,7 +82,7 @@ page_clear_nocache(pte_t *pte, unsigned long addr, static void * or1k_dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t gfp, - struct dma_attrs *attrs) + unsigned long attrs) { unsigned long va; void *page; @@ -117,7 +116,7 @@ or1k_dma_alloc(struct device *dev, size_t size, static void or1k_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 va = (unsigned long)vaddr; struct mm_walk walk = { @@ -137,7 +136,7 @@ static dma_addr_t or1k_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) { unsigned long cl; dma_addr_t addr = page_to_phys(page) + offset; @@ -170,7 +169,7 @@ or1k_map_page(struct device *dev, struct page *page, static void or1k_unmap_page(struct device *dev, dma_addr_t dma_handle, size_t size, enum dma_data_direction dir, - struct dma_attrs *attrs) + unsigned long attrs) { /* Nothing special to do here... */ } @@ -178,14 +177,14 @@ or1k_unmap_page(struct device *dev, dma_addr_t dma_handle, static int or1k_map_sg(struct device *dev, struct scatterlist *sg, int nents, enum dma_data_direction dir, - struct dma_attrs *attrs) + unsigned long attrs) { struct scatterlist *s; int i; for_each_sg(sg, s, nents, i) { s->dma_address = or1k_map_page(dev, sg_page(s), s->offset, - s->length, dir, NULL); + s->length, dir, 0); } return nents; @@ -194,13 +193,13 @@ or1k_map_sg(struct device *dev, struct scatterlist *sg, static void or1k_unmap_sg(struct device *dev, struct scatterlist *sg, int nents, enum dma_data_direction dir, - struct dma_attrs *attrs) + unsigned long attrs) { struct scatterlist *s; int i; for_each_sg(sg, s, nents, i) { - or1k_unmap_page(dev, sg_dma_address(s), sg_dma_len(s), dir, NULL); + or1k_unmap_page(dev, sg_dma_address(s), sg_dma_len(s), dir, 0); } } -- 1.9.1