From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161139AbcFJKZL (ORCPT ); Fri, 10 Jun 2016 06:25:11 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:12612 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932299AbcFJKMk (ORCPT ); Fri, 10 Jun 2016 06:12:40 -0400 X-AuditID: cbfec7f5-f792a6d000001302-b4-575a929624ad From: Krzysztof Kozlowski To: Andrew Morton Cc: hch@infradead.org, Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , Mikael Starvik , Jesper Nilsson , linux-cris-kernel@axis.com, linux-kernel@vger.kernel.org Subject: [PATCH v4 09/44] cris: dma-mapping: Use unsigned long for dma_attrs Date: Fri, 10 Jun 2016 12:11:26 +0200 Message-id: <1465553521-27303-10-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+NgFprCLMWRmVeSWpSXmKPExsVy+t/xa7rTJkWFGzTO5bSYs34Nm8XGGetZ LU5PWMRk8fzQLGaL1y8MLVasXsdscXnXHDaLPb9jHDg8rq8L8Ni8QsvjxIzfLB59W1Yxenze JBfAGsVlk5Kak1mWWqRvl8CV8f3FNaaCbt6Kl5ODGxhfc3UxcnJICJhI3H53kxHCFpO4cG89 WxcjF4eQwFJGib//PzODJIQEGpkkOjpsQGw2AWOJzcuXsIHYIgK6Eque72IGaWAWaGeSeHHr KdgkYQEficnTroDZLAKqEn/eHWcCsXkFPCRav86G2iYncfLYZFYQmxMo3n13JgvEMneJ7U9e MU1g5F3AyLCKUTS1NLmgOCk910ivODG3uDQvXS85P3cTIySsvu5gXHrM6hCjAAejEg9vxK7I cCHWxLLiytxDjBIczEoivBZ9UeFCvCmJlVWpRfnxRaU5qcWHGKU5WJTEeWfueh8iJJCeWJKa nZpakFoEk2Xi4JRqYNS82af/xlFIsT8+84oT11cNs/9nww/li4l0Rkbx2vspXvs799ZLxqZT /pYGZy6Xref/fPSZ5Gv3fevVf1SbFLw8sOXEXhaH0oLa0K0Zk0pNvOc9+Hu5+qxq6lYR3/11 kp0VRge7du0p8l5Znu0S6MAbcy3nmWmphufmHeKZm245T1++4E+XvRJLcUaioRZzUXEiAKcK g5AnAgAA 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