From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932200AbcF3If5 (ORCPT ); Thu, 30 Jun 2016 04:35:57 -0400 Received: from mailout3.w1.samsung.com ([210.118.77.13]:24571 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751951AbcF3I3H (ORCPT ); Thu, 30 Jun 2016 04:29:07 -0400 X-AuditID: cbfec7f5-f792a6d000001302-c4-5774d81a6ce7 From: Krzysztof Kozlowski To: Andrew Morton Cc: linux-kernel@vger.kernel.org, hch@infradead.org, Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , David Howells , linux-am33-list@redhat.com Subject: [PATCH v5 32/44] mn10300: dma-mapping: Use unsigned long for dma_attrs Date: Thu, 30 Jun 2016 10:25:59 +0200 Message-id: <1467275171-6298-32-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+NgFprMLMWRmVeSWpSXmKPExsVy+t/xK7pSN0rCDb52SlvMWb+GzWLjjPWs Fu+afrNYnJ6wiMni9QtDi1n777JYXN41h82B3WPzCi2PEzN+s3i833eVzaNvyypGj8+b5AJY o7hsUlJzMstSi/TtErgy3t56zVhwl7fi15p1TA2MK7i7GDk5JARMJL7P2cIEYYtJXLi3nq2L kYtDSGApo8S7lfugnEYmiTt3PzCDVLEJGEtsXr6EDcQWEdCVWPV8FzNIEbPAfUaJ3/uvM4Ik hAX8JaYd3sYCYrMIqEps3/SNHcTmFXCXeNJ0D2qdnMTJY5NZuxg5ODiB4rO/+0Msa2GUOLZv EvMERt4FjAyrGEVTS5MLipPSc430ihNzi0vz0vWS83M3MUKC6usOxqXHrA4xCnAwKvHwOjCX hAuxJpYVV+YeYpTgYFYS4d1+BSjEm5JYWZValB9fVJqTWnyIUZqDRUmcd+au9yFCAumJJanZ qakFqUUwWSYOTqkGRrXC15c2XNWJX5+9v+q42cqClbsvuCjwK7RL1K/817KbpZx/qf3EI/Ze ZX4zcidWf9x//G3byutH5fbabAqxz3u7WXtL1B+f0PP2Mo5Mnu7/2Y727KkPz7zEnrn5w0Lm BdfWKQp+yJi55cWbCcd6eROF3jxQWZ/+2G6V69QTwnOfum3u9D8nYKfEUpyRaKjFXFScCADp J3IFJgIAAA== 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/mn10300/mm/dma-alloc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/mn10300/mm/dma-alloc.c b/arch/mn10300/mm/dma-alloc.c index 8842394cb49a..4f4b9029f0ea 100644 --- a/arch/mn10300/mm/dma-alloc.c +++ b/arch/mn10300/mm/dma-alloc.c @@ -21,7 +21,7 @@ static unsigned long pci_sram_allocated = 0xbc000000; static void *mn10300_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) { unsigned long addr; void *ret; @@ -63,7 +63,7 @@ done: } static void mn10300_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) { unsigned long addr = (unsigned long) vaddr & ~0x20000000; @@ -75,7 +75,7 @@ static void mn10300_dma_free(struct device *dev, size_t size, void *vaddr, static int mn10300_dma_map_sg(struct device *dev, struct scatterlist *sglist, int nents, enum dma_data_direction direction, - struct dma_attrs *attrs) + unsigned long attrs) { struct scatterlist *sg; int i; @@ -92,7 +92,7 @@ static int mn10300_dma_map_sg(struct device *dev, struct scatterlist *sglist, static dma_addr_t mn10300_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_bus(page) + offset; } -- 1.9.1