From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932120AbcF3IrD (ORCPT ); Thu, 30 Jun 2016 04:47:03 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:47525 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752017AbcF3I1J (ORCPT ); Thu, 30 Jun 2016 04:27:09 -0400 X-AuditID: cbfec7f5-f792a6d000001302-48-5774d7d74c12 From: Krzysztof Kozlowski To: Andrew Morton Cc: linux-kernel@vger.kernel.org, hch@infradead.org, Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , Mikael Starvik , Jesper Nilsson , linux-cris-kernel@axis.com Subject: [PATCH v5 09/44] cris: dma-mapping: Use unsigned long for dma_attrs Date: Thu, 30 Jun 2016 10:25:36 +0200 Message-id: <1467275171-6298-9-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+NgFprCLMWRmVeSWpSXmKPExsVy+t/xK7rXr5eEG9zuFbaYs34Nm8XGGetZ LU5PWMRk8fzQLGaL1y8MLVasXsdscXnXHDaLPb9jHDg8rq8L8Ni8QsvjxIzfLB59W1Yxenze JBfAGsVlk5Kak1mWWqRvl8CV8f3FNaaCbt6Kl5ODGxhfc3UxcnJICJhIXDnZwgJhi0lcuLee DcQWEljKKLF/tVMXIxeQ3cgk0TTnPCtIgk3AWGLz8iVgRSICuhKrnu9iBiliFuhkkpi9tJ8Z JCEs4CNxc9ZeJhCbRUBVYtOyGewgNq+Am8SjGR9ZIbbJSZw8NhnI5uDgFHCXmP3dH2JZC6PE sX2TmCcw8i5gZFjFKJpamlxQnJSea6RXnJhbXJqXrpecn7uJERJWX3cwLj1mdYhRgINRiYfX gbkkXIg1say4MvcQowQHs5II7/YrQCHelMTKqtSi/Pii0pzU4kOM0hwsSuK8M3e9DxESSE8s Sc1OTS1ILYLJMnFwSjUwXtdKYyuu63hz55wjm8PsmWXFmzO8NM/8u7VkZsFr4R65D/OYFh0q PX3++x8hgYsPr/2+LzdNsvp6z/2U+Up6u/ZaK5XNf3Bvf86+o8dFbDJyzyTMlT5jsbf/Vl+D DcteIV3h39cYrd646l/Ot//GuuDQEqGz3dd6JExdf4hUVRodWDdn8pTvTkosxRmJhlrMRcWJ ACF8V5UnAgAA 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 [for cris] Acked-by: Jesper Nilsson --- arch/cris/arch-v32/drivers/pci/dma.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/cris/arch-v32/drivers/pci/dma.c b/arch/cris/arch-v32/drivers/pci/dma.c index 8d5efa58cce1..1f0636793f0c 100644 --- a/arch/cris/arch-v32/drivers/pci/dma.c +++ b/arch/cris/arch-v32/drivers/pci/dma.c @@ -17,7 +17,7 @@ #include static void *v32_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; @@ -37,22 +37,21 @@ static void *v32_dma_alloc(struct device *dev, size_t size, } static void v32_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_pages((unsigned long)vaddr, get_order(size)); } static inline dma_addr_t v32_dma_map_page(struct device *dev, struct page *page, unsigned long offset, size_t size, - enum dma_data_direction direction, - struct dma_attrs *attrs) + enum dma_data_direction direction, unsigned long attrs) { return page_to_phys(page) + offset; } static inline int v32_dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, enum dma_data_direction direction, - struct dma_attrs *attrs) + unsigned long attrs) { printk("Map sg\n"); return nents; -- 1.9.1