From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752207AbcF3Irq (ORCPT ); Thu, 30 Jun 2016 04:47:46 -0400 Received: from mailout3.w1.samsung.com ([210.118.77.13]:24499 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751898AbcF3I1E (ORCPT ); Thu, 30 Jun 2016 04:27:04 -0400 X-AuditID: cbfec7f5-f792a6d000001302-3d-5774d7d6a518 From: Krzysztof Kozlowski To: Andrew Morton Cc: linux-kernel@vger.kernel.org, hch@infradead.org, Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , Steven Miao , adi-buildroot-devel@lists.sourceforge.net Subject: [PATCH v5 07/44] blackfin: dma-mapping: Use unsigned long for dma_attrs Date: Thu, 30 Jun 2016 10:25:34 +0200 Message-id: <1467275171-6298-7-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/xK7rXrpeEG0zsZbU4vqGBzWLO+jVs FhtnrGe1OD1hEZPF6xeGFpd3zWGz2PlxAZsDu8fOWXfZPTav0PI4MeM3i8fuBZ+ZPPq2rGL0 +LxJLoAtissmJTUnsyy1SN8ugSvjbtcv9oKHvBXTT3s1MG7h7mLk5JAQMJHo+tXODmGLSVy4 t56ti5GLQ0hgKaPE9Kn/WCGcRiaJ1/vfsoBUsQkYS2xevoQNxBYR0JVY9XwXM0gRs8ArRokL k9cwgiSEBQIktrVPAStiEVCVmDbrEROIzSvgJtHcNx1qnZzEyWOTgTZwcHAKuEvM/u4PsayF UeLYvknMExh5FzAyrGIUTS1NLihOSs810itOzC0uzUvXS87P3cQICa6vOxiXHrM6xCjAwajE w+vAXBIuxJpYVlyZe4hRgoNZSYR3+xWgEG9KYmVValF+fFFpTmrxIUZpDhYlcd6Zu96HCAmk J5akZqemFqQWwWSZODilGhhrFue4iDfWv/ms3MYS2rugj5vNzzDmZK2W6brJmr3t9ZMTCh/N M1yyaOXT1JTQiBgjDnn7mfyhW5xEVfuiN7XMmXhQWeeQ0RXDzW9EVFaZZQYdezH52RKtxb5R k/Y6Se/mmDv7NN+tyh/57Fkzvnsxsix7U+J2sNTLJveaUWfbmwPu6nNkbJRYijMSDbWYi4oT AXtEoTwqAgAA 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/blackfin/kernel/dma-mapping.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/blackfin/kernel/dma-mapping.c b/arch/blackfin/kernel/dma-mapping.c index 771afe6e4264..53fbbb61aa86 100644 --- a/arch/blackfin/kernel/dma-mapping.c +++ b/arch/blackfin/kernel/dma-mapping.c @@ -79,7 +79,7 @@ static void __free_dma_pages(unsigned long addr, unsigned int pages) } static void *bfin_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; @@ -94,7 +94,7 @@ static void *bfin_dma_alloc(struct device *dev, size_t size, } static void bfin_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) { __free_dma_pages((unsigned long)vaddr, get_pages(size)); } @@ -111,7 +111,7 @@ EXPORT_SYMBOL(__dma_sync); static int bfin_dma_map_sg(struct device *dev, struct scatterlist *sg_list, int nents, enum dma_data_direction direction, - struct dma_attrs *attrs) + unsigned long attrs) { struct scatterlist *sg; int i; @@ -139,7 +139,7 @@ static void bfin_dma_sync_sg_for_device(struct device *dev, static dma_addr_t bfin_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) { dma_addr_t handle = (dma_addr_t)(page_address(page) + offset); -- 1.9.1