From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932592AbcFJKZz (ORCPT ); Fri, 10 Jun 2016 06:25:55 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:43989 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753114AbcFJKMe (ORCPT ); Fri, 10 Jun 2016 06:12:34 -0400 X-AuditID: cbfec7f5-f792a6d000001302-9e-575a92908a43 From: Krzysztof Kozlowski To: Andrew Morton Cc: hch@infradead.org, Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , Steven Miao , adi-buildroot-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: [PATCH v4 07/44] blackfin: dma-mapping: Use unsigned long for dma_attrs Date: Fri, 10 Jun 2016 12:11:24 +0200 Message-id: <1465553521-27303-8-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+NgFprGLMWRmVeSWpSXmKPExsVy+t/xa7oTJkWFG3w9rmlxfEMDm8Wc9WvY LDbOWM9qcXrCIiaL1y8MLS7vmsNmsfPjAjYHdo+ds+6ye2xeoeVxYsZvFo/dCz4zefRtWcXo 8XmTXABbFJdNSmpOZllqkb5dAlfG3a5f7AUPeSumn/ZqYNzC3cXIySEhYCLxf/J/RghbTOLC vfVsXYxcHEICSxkl3i34wQzhNDJJbN1zHKyKTcBYYvPyJWwgtoiArsSq57vAipgFXjFKnJo7 kwUkISwQIHF8xkxmEJtFQFVi1vPNTF2MHBy8Au4S074oQ2yTkzh5bDIriM0p4CHRfReiVQio ZPuTV0wTGHkXMDKsYhRNLU0uKE5KzzXSK07MLS7NS9dLzs/dxAgJra87GJceszrEKMDBqMTD G7ErMlyINbGsuDL3EKMEB7OSCK9FX1S4EG9KYmVValF+fFFpTmrxIUZpDhYlcd6Zu96HCAmk J5akZqemFqQWwWSZODilGhizv6r84/2iEDP/+f9FNydeOqh7Y8pBPTPr0i2l+fkBNv0fvhW4 b2AOMLbx7DDP7OgX7OqW1pt574mEpdCG2ibpxF1afre8PihqhT2JPntGbLviXi7ZhfMf/mpd +yvtqUVWk+Rm7TIJkVcS7MecHsgdu9lypOgB9+OV062amoLPXdxa7bXY8rcSS3FGoqEWc1Fx IgD4hkkEKQIAAA== 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