From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932243AbcGMInP (ORCPT ); Wed, 13 Jul 2016 04:43:15 -0400 Received: from mailout3.w1.samsung.com ([210.118.77.13]:55532 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751755AbcGMIm5 (ORCPT ); Wed, 13 Jul 2016 04:42:57 -0400 X-AuditID: cbfec7f4-f796c6d000001486-d3-5785fef57ae7 From: Krzysztof Kozlowski To: Andrew Morton Cc: linux-kernel@vger.kernel.org, hch@infradead.org, Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , Ley Foon Tan , nios2-dev@lists.rocketboards.org Subject: [PATCH v6 34/46] nios2: dma-mapping: Use unsigned long for dma_attrs Date: Wed, 13 Jul 2016 10:41:25 +0200 Message-id: <1468399300-5399-34-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1468399300-5399-33-git-send-email-k.kozlowski@samsung.com> References: <1468399167-28083-1-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-1-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-2-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-3-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-4-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-5-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-6-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-7-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-8-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-9-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-10-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-11-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-12-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-13-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-14-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-15-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-16-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-17-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-18-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-19-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-20-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-21-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-22-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-23-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-24-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-25-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-26-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-27-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-28-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-29-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-30-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-31-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-32-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-33-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprOLMWRmVeSWpSXmKPExsVy+t/xq7pf/7WGGxybbG4xZ/0aNouNM9az WpyesIjJ4vULQ4unE+6wWVzeNYfNomvWUzYHdo/WvRPYPDav0PI4MeM3i8fV5UuYPPq2rGL0 +LxJLoAtissmJTUnsyy1SN8ugSvj9axO1oIFQhVr5rWzNDD+4eti5OSQEDCRmL1lIROELSZx 4d56ti5GLg4hgaWMElMP7meHcBqZJFrftzOCVLEJGEtsXr6EDcQWEdCVWPV8FzNIEbPAQ0aJ DW96WUESwgK+Et8m3Qcq4uBgEVCVmNFWARLmFXCXODzxMCvENjmJk8cms4KUcAp4SLxaowyx a4+AxIY/G1gmMPIuYGRYxSiaWppcUJyUnmuoV5yYW1yal66XnJ+7iRESXF92MC4+ZnWIUYCD UYmHl1GkNVyINbGsuDL3EKMEB7OSCO/Tv0Ah3pTEyqrUovz4otKc1OJDjNIcLErivHN3vQ8R EkhPLEnNTk0tSC2CyTJxcEo1MIYafuU/XcQq31+yrqdg8fSNoc6HVN9oNHn8tu8UvvNklS2n 7IwrFv5Xq52tQo9djWFqi+O7Ieaop35zq6Tc9vLLlUWFiy8YxrGeEo+yEu6xLTbnidjz8HJz TmjsN+Gtj9a11CbXX+t3kta7b6zs+6rSrPWn0qv5Fqb7CnYfOfc3v3TClF1KSizFGYmGWsxF xYkAgA5OpCoCAAA= 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/nios2/mm/dma-mapping.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/nios2/mm/dma-mapping.c b/arch/nios2/mm/dma-mapping.c index 90422c367ed3..d800fad87896 100644 --- a/arch/nios2/mm/dma-mapping.c +++ b/arch/nios2/mm/dma-mapping.c @@ -59,7 +59,7 @@ static inline void __dma_sync_for_cpu(void *vaddr, size_t size, } static void *nios2_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) { void *ret; @@ -84,7 +84,7 @@ static void *nios2_dma_alloc(struct device *dev, size_t size, } static void nios2_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) CAC_ADDR((unsigned long) vaddr); @@ -93,7 +93,7 @@ static void nios2_dma_free(struct device *dev, size_t size, void *vaddr, static int nios2_dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, enum dma_data_direction direction, - struct dma_attrs *attrs) + unsigned long attrs) { int i; @@ -113,7 +113,7 @@ static int nios2_dma_map_sg(struct device *dev, struct scatterlist *sg, static dma_addr_t nios2_dma_map_page(struct device *dev, struct page *page, unsigned long offset, size_t size, enum dma_data_direction direction, - struct dma_attrs *attrs) + unsigned long attrs) { void *addr = page_address(page) + offset; @@ -123,14 +123,14 @@ static dma_addr_t nios2_dma_map_page(struct device *dev, struct page *page, static void nios2_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 void nios2_dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries, enum dma_data_direction direction, - struct dma_attrs *attrs) + unsigned long attrs) { void *addr; int i; -- 1.9.1