From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753008AbcGMIvP (ORCPT ); Wed, 13 Jul 2016 04:51:15 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:45697 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751654AbcGMIm1 (ORCPT ); Wed, 13 Jul 2016 04:42:27 -0400 X-AuditID: cbfec7f4-f796c6d000001486-49-5785fedb4dd2 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 v6 08/46] blackfin: dma-mapping: Use unsigned long for dma_attrs Date: Wed, 13 Jul 2016 10:40:59 +0200 Message-id: <1468399300-5399-8-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1468399300-5399-7-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> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprOLMWRmVeSWpSXmKPExsVy+t/xq7q3/7WGG3xpFbY4vqGBzWLO+jVs FhtnrGe1OD1hEZPF6xeGFpd3zWGz2PlxAZsDu8fOWXfZPTav0PI4MeM3i8fuBZ+ZPPq2rGL0 +LxJLoAtissmJTUnsyy1SN8ugSvjbtcv9oKHvBXTT3s1MG7h7mLk5JAQMJG43H6HFcIWk7hw bz1bFyMXh5DAUkaJp53PWSCcRiaJvw1T2UGq2ASMJTYvX8IGYosI6Eqser6LGaSIWeAVo8SF yWsYQRLCAgESk9e9ZwGxWQRUJeacPMwMYvMKuElcWLOHGWKdnMTJY5OBVnNwcAq4Syw/kA6x 7BOzxOdHq5knMPIuYGRYxSiaWppcUJyUnmuoV5yYW1yal66XnJ+7iRESXF92MC4+ZnWIUYCD UYmHl1GkNVyINbGsuDL3EKMEB7OSCO/Tv0Ah3pTEyqrUovz4otKc1OJDjNIcLErivHN3vQ8R EkhPLEnNTk0tSC2CyTJxcEo1MGq8/bjzX3eyHhMba4J58jXrhVV5lv9/vNh3Tb5o/d8tB3en 99jPXs99dkb/odumK35d52r6VFPddviTvwfj/8OH/WIbvC+1B0kIFp1YuOGVpbOE/UMemT+r K7Rvh/wy1WaWCFu27GjeuZpjGa1piyuMPUx+7pymLppYvtn52+39TcGBR3cY/1ZiKc5INNRi LipOBADs4rEpKgIAAA== 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