From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932283AbcGMIqM (ORCPT ); Wed, 13 Jul 2016 04:46:12 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:21825 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932281AbcGMInr (ORCPT ); Wed, 13 Jul 2016 04:43:47 -0400 X-AuditID: cbfec7f4-f796c6d000001486-f1-5785fefba6a3 From: Krzysztof Kozlowski To: Andrew Morton Cc: linux-kernel@vger.kernel.org, hch@infradead.org, Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , Chris Zankel , Max Filippov , linux-xtensa@linux-xtensa.org Subject: [PATCH v6 43/46] xtensa: dma-mapping: Use unsigned long for dma_attrs Date: Wed, 13 Jul 2016 10:41:34 +0200 Message-id: <1468399300-5399-43-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1468399300-5399-42-git-send-email-k.kozlowski@samsung.com> References: <1468399167-28083-1-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-1-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-2-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-3-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-4-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-5-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-6-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-7-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-8-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-9-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-10-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-11-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-12-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-13-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-14-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-15-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-16-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-17-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-18-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-19-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-20-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-21-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-22-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-23-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-24-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-25-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-26-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-27-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-28-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-29-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-30-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-31-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-32-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-33-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-34-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-35-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-36-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-37-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-38-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-39-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-40-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-41-git-send-email-k.kozlowski@samsung.com> <1468399300-5399-42-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrMLMWRmVeSWpSXmKPExsVy+t/xq7q//7WGGxx7ImkxZ/0aNouNM9az WnQvWs5mcXrCIiaLbw8XMlq8fmFocXnXHDaLlWfXsjtweOycdZfdY/MKLY8TM36zeLw4uJ3Z o2/LKkaPz5vkPF6v3soYwB7FZZOSmpNZllqkb5fAlbFx4QSWgqnCFccnf2FqYOzj72Lk5JAQ MJHouP6NFcIWk7hwbz1bFyMXh5DAUkaJ4xOPM0E4jUwS25bfYwSpYhMwlti8fAkbiC0ioCux 6vkuZpAiZoFmJok1V2eBJYQF/CReX3oI1sAioCqxZNE1JhCbV8BdYt3Ws2wQ6+QkTh6bDLaa U8BD4t7DM4wQ216JSEybuol9AiPvAkaGVYyiqaXJBcVJ6bmGesWJucWleel6yfm5mxghQfdl B+PiY1aHGAU4GJV4eBlFWsOFWBPLiitzDzFKcDArifA+/QsU4k1JrKxKLcqPLyrNSS0+xCjN waIkzjt31/sQIYH0xJLU7NTUgtQimCwTB6dUA2PM5qLgwEBpe2E27U+zyw95uJ7aYHylMcFG 8SFH8xSxDPa0Et3O6nccx/+Ia507YPRi6X4uE60rqxiPpRxasrZbXW6Ca/RRVU7Hmpkm/DVH VqXcXGzQu+rKWYaNbz4FTqrZuELS+92yPVVau1X+7Aq2rb5WVtT9kW3hrGmVabuvXQ3VUl06 Y7USS3FGoqEWc1FxIgBC8eViNgIAAA== 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/xtensa/kernel/pci-dma.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/xtensa/kernel/pci-dma.c b/arch/xtensa/kernel/pci-dma.c index cd66698348ca..1e68806d6695 100644 --- a/arch/xtensa/kernel/pci-dma.c +++ b/arch/xtensa/kernel/pci-dma.c @@ -142,7 +142,7 @@ static void xtensa_sync_sg_for_device(struct device *dev, static void *xtensa_dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, gfp_t flag, - struct dma_attrs *attrs) + unsigned long attrs) { unsigned long ret; unsigned long uncached = 0; @@ -171,7 +171,7 @@ static void *xtensa_dma_alloc(struct device *dev, size_t size, } static void xtensa_dma_free(struct device *hwdev, 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 + XCHAL_KSEG_CACHED_VADDR - XCHAL_KSEG_BYPASS_VADDR; @@ -185,7 +185,7 @@ static void xtensa_dma_free(struct device *hwdev, size_t size, void *vaddr, static dma_addr_t xtensa_map_page(struct device *dev, struct page *page, unsigned long offset, size_t size, enum dma_data_direction dir, - struct dma_attrs *attrs) + unsigned long attrs) { dma_addr_t dma_handle = page_to_phys(page) + offset; @@ -195,14 +195,14 @@ static dma_addr_t xtensa_map_page(struct device *dev, struct page *page, static void xtensa_unmap_page(struct device *dev, dma_addr_t dma_handle, size_t size, enum dma_data_direction dir, - struct dma_attrs *attrs) + unsigned long attrs) { xtensa_sync_single_for_cpu(dev, dma_handle, size, dir); } static int xtensa_map_sg(struct device *dev, struct scatterlist *sg, int nents, enum dma_data_direction dir, - struct dma_attrs *attrs) + unsigned long attrs) { struct scatterlist *s; int i; @@ -217,7 +217,7 @@ static int xtensa_map_sg(struct device *dev, struct scatterlist *sg, static void xtensa_unmap_sg(struct device *dev, struct scatterlist *sg, int nents, enum dma_data_direction dir, - struct dma_attrs *attrs) + unsigned long attrs) { struct scatterlist *s; int i; -- 1.9.1