From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932203AbcF3I3h (ORCPT ); Thu, 30 Jun 2016 04:29:37 -0400 Received: from mailout3.w1.samsung.com ([210.118.77.13]:24674 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932118AbcF3I3e (ORCPT ); Thu, 30 Jun 2016 04:29:34 -0400 X-AuditID: cbfec7f4-f796c6d000001486-83-5774d81fb267 From: Krzysztof Kozlowski To: Andrew Morton Cc: linux-kernel@vger.kernel.org, hch@infradead.org, Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , Guan Xuetao Subject: [PATCH v5 41/44] unicore32: dma-mapping: Use unsigned long for dma_attrs Date: Thu, 30 Jun 2016 10:26:08 +0200 Message-id: <1467275171-6298-41-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+NgFupmluLIzCtJLcpLzFFi42I5/e/4FV35GyXhBvs+6lvMWb+GzWLjjPWs FgdvfGO3OD1hEZPF6xeGFpd3zWFzYPPYvELL48SM3ywej/daevRtWcXo8XmTXABrFJdNSmpO Zllqkb5dAlfGik8nWAp+sFd82/KBvYFxM1sXIyeHhICJxM8d1xghbDGJC/fWA8W5OIQEljJK fPwzlRkkISTQyCRxbLshiM0mYCyxefkSsGYRAV2JVc93MYM0MAscZJRYcbwXrEFYIFhi2uTr 7F2MHBwsAqoS/046g4R5BdwlnvZcYYdYJidx8thkVpASTqD47O/+EHtbGCWO7ZvEPIGRdwEj wypG0dTS5ILipPRcQ73ixNzi0rx0veT83E2MkCD6soNx8TGrQ4wCHIxKPLwOzCXhQqyJZcWV uYcYJTiYlUR4t18BCvGmJFZWpRblxxeV5qQWH2KU5mBREuedu+t9iJBAemJJanZqakFqEUyW iYNTqoGx+9BDtQWvn/FOnfQ93JCTX12ggEsgJann5kuOIzeLP76qtRc+M/vAp7UyjJ9fNmnW K9tp2O1pDrirwPbvq9lkhgqx9+sFFrpL/7+zSjr1w40ctx/Jy0+UqyscYmiL0bzLcJNp6Rn2 JSoXlk0ridsqcGldli7D6zg+jZoG7l7ed3Om1r+78uOfEktxRqKhFnNRcSIAW4uRHx4CAAA= 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