From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932149AbcF3Ifz (ORCPT ); Thu, 30 Jun 2016 04:35:55 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:47592 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932065AbcF3I3I (ORCPT ); Thu, 30 Jun 2016 04:29:08 -0400 X-AuditID: cbfec7f4-f796c6d000001486-6b-5774d81abf84 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 v5 33/44] nios2: dma-mapping: Use unsigned long for dma_attrs Date: Thu, 30 Jun 2016 10:26:00 +0200 Message-id: <1467275171-6298-33-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+NgFprOLMWRmVeSWpSXmKPExsVy+t/xK7pSN0rCDb7/sbKYs34Nm8XGGetZ LU5PWMRk8fqFocXTCXfYLC7vmsNm0TXrKZsDu0fr3glsHptXaHmcmPGbxePq8iVMHn1bVjF6 fN4kF8AWxWWTkpqTWZZapG+XwJXxelYna8ECoYo189pZGhj/8HUxcnJICJhI3Dzfywphi0lc uLeerYuRi0NIYCmjxKO1c6GcRiaJO3c/MINUsQkYS2xevoQNxBYR0JVY9XwXM0gRs8BDRokN byBGCQv4SnzavIkJxGYRUJXoOrYVKM7BwSvgLnF+tijENjmJk8cmg4U5gcKzv/tD7GphlDi2 bxLzBEbeBYwMqxhFU0uTC4qT0nMN9YoTc4tL89L1kvNzNzFCguvLDsbFx6wOMQpwMCrx8Dow l4QLsSaWFVfmHmKU4GBWEuHdfgUoxJuSWFmVWpQfX1Sak1p8iFGag0VJnHfurvchQgLpiSWp 2ampBalFMFkmDk6pBsZa23bh2KUX9JwUBAxsjnGXLFglKrrV5tcVt0nO1st9qlZdvaq5L6Oe 67iX3pat3SrV+RGbsnX+hCkwnbqy4r5q36/ydbmPhRRq8o9zfr6QU7ZDkp9B+Ue7g9lcj7O7 DBcdvdHFWfc24GZz12b5Yyxb7h99cFdOK/iUpmVOSO+5Xd3//miaeyuxFGckGmoxFxUnAgB5 0VJ9KgIAAA== 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