From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932434AbcFJKMp (ORCPT ); Fri, 10 Jun 2016 06:12:45 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:44010 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932296AbcFJKMn (ORCPT ); Fri, 10 Jun 2016 06:12:43 -0400 X-AuditID: cbfec7f5-f792a6d000001302-bc-575a9298a014 From: Krzysztof Kozlowski To: Andrew Morton Cc: hch@infradead.org, Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , Akinobu Mita , linux-kernel@vger.kernel.org Subject: [PATCH v4 10/44] frv: dma-mapping: Use unsigned long for dma_attrs Date: Fri, 10 Jun 2016 12:11:27 +0200 Message-id: <1465553521-27303-11-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+NgFupjluLIzCtJLcpLzFFi42I5/e/4Nd0Zk6LCDS5e1bd4daCD0WLO+jVs FhtnrGe1OD1hEZPF6xeGFpd3zWFzYPPYOesuu8fmFVoeJ2b8ZvHo27KK0ePzJrkA1igum5TU nMyy1CJ9uwSujAOHD7IVbJCqWHN0CmMD4y/RLkZODgkBE4lZr56xQthiEhfurWfrYuTiEBJY yiixePUeFginkUnizvnzYFVsAsYSm5cvYQOxRQR0JVY938UMUsQscJhR4uC1h4wgCWEBb4nm fU+ZQWwWAVWJ1V8WgMV5BTwk3s59ygKxTk7i5LHJYEM5geLdd2eCxYUE3CW2P3nFNIGRdwEj wypG0dTS5ILipPRcI73ixNzi0rx0veT83E2MkFD6uoNx6TGrQ4wCHIxKPLwRuyLDhVgTy4or cw8xSnAwK4nwWvRFhQvxpiRWVqUW5ccXleakFh9ilOZgURLnnbnrfYiQQHpiSWp2ampBahFM lomDU6qBcWXx8yPqrVbRRRY5t15zmF61PW9zbb1Lulm4HWvlDUt+bXdtiTilvhOBLlwRT5I3 ij78EzZ7guN7qV+Rj1nNRbS3PVwUNiFhIuvLSRzcxW0bGov0XrW+/nC//Vj83LcuvIny+xa9 5l5WJPe98UH1tE9bIw5uebHk4VXz6r8WEek5Qide73k/U4mlOCPRUIu5qDgRAMeWgkchAgAA 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/frv/mb93090-mb00/pci-dma-nommu.c | 8 ++++---- arch/frv/mb93090-mb00/pci-dma.c | 9 ++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/arch/frv/mb93090-mb00/pci-dma-nommu.c b/arch/frv/mb93090-mb00/pci-dma-nommu.c index 082be49b5df0..90f2e4cb33d6 100644 --- a/arch/frv/mb93090-mb00/pci-dma-nommu.c +++ b/arch/frv/mb93090-mb00/pci-dma-nommu.c @@ -35,7 +35,7 @@ static DEFINE_SPINLOCK(dma_alloc_lock); static LIST_HEAD(dma_alloc_list); static void *frv_dma_alloc(struct device *hwdev, size_t size, dma_addr_t *dma_handle, - gfp_t gfp, struct dma_attrs *attrs) + gfp_t gfp, unsigned long attrs) { struct dma_alloc_record *new; struct list_head *this = &dma_alloc_list; @@ -86,7 +86,7 @@ static void *frv_dma_alloc(struct device *hwdev, size_t size, dma_addr_t *dma_ha } static void frv_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) { struct dma_alloc_record *rec; unsigned long flags; @@ -107,7 +107,7 @@ static void frv_dma_free(struct device *hwdev, size_t size, void *vaddr, static int frv_dma_map_sg(struct device *dev, struct scatterlist *sglist, int nents, enum dma_data_direction direction, - struct dma_attrs *attrs) + unsigned long attrs) { int i; struct scatterlist *sg; @@ -124,7 +124,7 @@ static int frv_dma_map_sg(struct device *dev, struct scatterlist *sglist, static dma_addr_t frv_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) { BUG_ON(direction == DMA_NONE); flush_dcache_page(page); diff --git a/arch/frv/mb93090-mb00/pci-dma.c b/arch/frv/mb93090-mb00/pci-dma.c index 316b7b65348d..f585745b1abc 100644 --- a/arch/frv/mb93090-mb00/pci-dma.c +++ b/arch/frv/mb93090-mb00/pci-dma.c @@ -19,8 +19,7 @@ #include static void *frv_dma_alloc(struct device *hwdev, 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; @@ -32,14 +31,14 @@ static void *frv_dma_alloc(struct device *hwdev, size_t size, } static void frv_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) { consistent_free(vaddr); } static int frv_dma_map_sg(struct device *dev, struct scatterlist *sglist, int nents, enum dma_data_direction direction, - struct dma_attrs *attrs) + unsigned long attrs) { unsigned long dampr2; void *vaddr; @@ -69,7 +68,7 @@ static int frv_dma_map_sg(struct device *dev, struct scatterlist *sglist, static dma_addr_t frv_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) { flush_dcache_page(page); return (dma_addr_t) page_to_phys(page) + offset; -- 1.9.1