From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932615AbcFJKOT (ORCPT ); Fri, 10 Jun 2016 06:14:19 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:44131 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161206AbcFJKOK (ORCPT ); Fri, 10 Jun 2016 06:14:10 -0400 X-AuditID: cbfec7f4-f796c6d000001486-1d-575a92f078c2 From: Krzysztof Kozlowski To: Andrew Morton Cc: hch@infradead.org, Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , Guan Xuetao , linux-kernel@vger.kernel.org Subject: [PATCH v4 41/44] unicore32: dma-mapping: Use unsigned long for dma_attrs Date: Fri, 10 Jun 2016 12:11:58 +0200 Message-id: <1465553521-27303-42-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+NgFuplluLIzCtJLcpLzFFi42I5/e/4Nd0Pk6LCDU4+trCYs34Nm8XGGetZ LQ7e+MZucXrCIiaL1y8MLS7vmsPmwOaxeYWWx4kZv1k8Hu+19OjbsorR4/MmuQDWKC6blNSc zLLUIn27BK6MFZ9OsBT8YK/4tuUDewPjZrYuRk4OCQETiZ1/+pghbDGJC/fWA8W5OIQEljJK dK2aBuU0Mkm8ebiACaSKTcBYYvPyJWDdIgK6Eque72IGKWIW2M8ocfTNYVaQhLBAsMTPq8vB ilgEVCXmvfzKDmLzCnhIXG6ZzgixTk7i5LHJYPWcQPHuuzNZQGwhAXeJ7U9eMU1g5F3AyLCK UTS1NLmgOCk911CvODG3uDQvXS85P3cTIySQvuxgXHzM6hCjAAejEg9vxK7IcCHWxLLiytxD jBIczEoivBZ9UeFCvCmJlVWpRfnxRaU5qcWHGKU5WJTEeefueh8iJJCeWJKanZpakFoEk2Xi 4JRqYFQ9tM9n2sPwLdrVz3l+cfz6/7zSVOlXyZ8n6d2Bvs8dVuswsRxt8jrbNM3NN0S75ZPP p4VS0y4tmBqbs/t1aOwMlwbGpK9rT5wUYWvb3bZrkVx5wTXHKV8SROK2/Pp7iMehdL1eeZaf hZNHWt7MBsMLp7syM2exyCpE/+Z8cV16Lf+lvEn7DyuxFGckGmoxFxUnAgDOxxB0IAIAAA== 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/unicore32/mm/dma-swiotlb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/unicore32/mm/dma-swiotlb.c b/arch/unicore32/mm/dma-swiotlb.c index 16c08b2143a7..3e9f6489ba38 100644 --- a/arch/unicore32/mm/dma-swiotlb.c +++ b/arch/unicore32/mm/dma-swiotlb.c @@ -19,14 +19,14 @@ static void *unicore_swiotlb_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flags, - struct dma_attrs *attrs) + unsigned long attrs) { return swiotlb_alloc_coherent(dev, size, dma_handle, flags); } static void unicore_swiotlb_free_coherent(struct device *dev, size_t size, void *vaddr, dma_addr_t dma_addr, - struct dma_attrs *attrs) + unsigned long attrs) { swiotlb_free_coherent(dev, size, vaddr, dma_addr); } -- 1.9.1