From: Krzysztof Kozlowski <k.kozlowski@samsung.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: hch@infradead.org, Krzysztof Kozlowski <k.kozlowski@samsung.com>,
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
Jonas Bonn <jonas@southpole.se>,
Hans-Christian Noren Egtvedt <egtvedt@samfundet.no>,
linux-kernel@vger.kernel.org
Subject: [PATCH v4 34/44] openrisc: dma-mapping: Use unsigned long for dma_attrs
Date: Fri, 10 Jun 2016 12:11:51 +0200 [thread overview]
Message-ID: <1465553521-27303-35-git-send-email-k.kozlowski@samsung.com> (raw)
In-Reply-To: <1465553521-27303-1-git-send-email-k.kozlowski@samsung.com>
Split out subsystem specific changes for easier reviews. This will be
squashed with main commit.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
---
arch/openrisc/kernel/dma.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/arch/openrisc/kernel/dma.c b/arch/openrisc/kernel/dma.c
index 0b77ddb1ee07..50eb1f26c540 100644
--- a/arch/openrisc/kernel/dma.c
+++ b/arch/openrisc/kernel/dma.c
@@ -22,7 +22,6 @@
#include <linux/dma-mapping.h>
#include <linux/dma-debug.h>
#include <linux/export.h>
-#include <linux/dma-attrs.h>
#include <asm/cpuinfo.h>
#include <asm/spr_defs.h>
@@ -83,7 +82,7 @@ page_clear_nocache(pte_t *pte, unsigned long addr,
static void *
or1k_dma_alloc(struct device *dev, size_t size,
dma_addr_t *dma_handle, gfp_t gfp,
- struct dma_attrs *attrs)
+ unsigned long attrs)
{
unsigned long va;
void *page;
@@ -117,7 +116,7 @@ or1k_dma_alloc(struct device *dev, size_t size,
static void
or1k_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 va = (unsigned long)vaddr;
struct mm_walk walk = {
@@ -137,7 +136,7 @@ static dma_addr_t
or1k_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)
{
unsigned long cl;
dma_addr_t addr = page_to_phys(page) + offset;
@@ -170,7 +169,7 @@ or1k_map_page(struct device *dev, struct page *page,
static void
or1k_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)
{
/* Nothing special to do here... */
}
@@ -178,14 +177,14 @@ or1k_unmap_page(struct device *dev, dma_addr_t dma_handle,
static int
or1k_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;
for_each_sg(sg, s, nents, i) {
s->dma_address = or1k_map_page(dev, sg_page(s), s->offset,
- s->length, dir, NULL);
+ s->length, dir, 0);
}
return nents;
@@ -194,13 +193,13 @@ or1k_map_sg(struct device *dev, struct scatterlist *sg,
static void
or1k_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;
for_each_sg(sg, s, nents, i) {
- or1k_unmap_page(dev, sg_dma_address(s), sg_dma_len(s), dir, NULL);
+ or1k_unmap_page(dev, sg_dma_address(s), sg_dma_len(s), dir, 0);
}
}
--
1.9.1
next prev parent reply other threads:[~2016-06-10 10:16 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-10 10:11 [PATCH v4 00/44] dma-mapping: Use unsigned long for dma_attrs Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 01/44] " Krzysztof Kozlowski
2016-06-10 14:49 ` Luis R. Rodriguez
2016-06-10 20:16 ` Krzysztof Kozlowski
2016-06-10 20:23 ` Luis R. Rodriguez
2016-06-10 20:44 ` Krzysztof Kozlowski
2016-06-10 21:08 ` Luis R. Rodriguez
2016-06-13 16:00 ` Christoph Hellwig
2016-06-13 17:41 ` Luis R. Rodriguez
2016-06-10 10:11 ` [PATCH v4 02/44] alpha: " Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 03/44] arc: " Krzysztof Kozlowski
2016-06-10 10:54 ` Vineet Gupta
2016-06-10 10:11 ` [PATCH v4 04/44] ARM: " Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 05/44] arm64: " Krzysztof Kozlowski
2016-06-10 10:51 ` Robin Murphy
2016-06-10 10:55 ` Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 06/44] avr32: " Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 07/44] blackfin: " Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 08/44] c6x: " Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 09/44] cris: " Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 10/44] frv: " Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 11/44] drm/exynos: " Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 12/44] drm/mediatek: " Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 13/44] drm/msm: " Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 14/44] drm/nouveau: " Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 15/44] drm/rockship: " Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 16/44] infiniband: " Krzysztof Kozlowski
2016-06-10 18:18 ` Bart Van Assche
2016-06-13 15:08 ` Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 17/44] iommu: " Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 18/44] [media] " Krzysztof Kozlowski
[not found] ` <575AB26E.4020401@st.com>
2016-06-10 12:37 ` Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 19/44] xen: " Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 20/44] swiotlb: " Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 21/44] powerpc: " Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 22/44] video: " Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 23/44] x86: " Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 24/44] iommu: intel: " Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 25/44] h8300: " Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 26/44] hexagon: " Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 27/44] ia64: " Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 28/44] m68k: " Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 29/44] metag: " Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 30/44] microblaze: " Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 31/44] mips: " Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 32/44] mn10300: " Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 33/44] nios2: " Krzysztof Kozlowski
2016-06-10 10:11 ` Krzysztof Kozlowski [this message]
2016-06-10 10:11 ` [PATCH v4 35/44] parisc: " Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 36/44] misc: mic: " Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 37/44] s390: " Krzysztof Kozlowski
2016-06-10 16:30 ` Gerald Schaefer
2016-06-10 10:11 ` [PATCH v4 38/44] sh: " Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 39/44] sparc: " Krzysztof Kozlowski
2016-06-10 17:43 ` David Miller
2016-06-10 20:03 ` Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 40/44] tile: " Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 41/44] unicore32: " Krzysztof Kozlowski
2016-06-10 10:11 ` [PATCH v4 42/44] xtensa: " Krzysztof Kozlowski
2016-06-10 10:12 ` [PATCH v4 44/44] dma-mapping: Document the DMA attributes next to the declaration Krzysztof Kozlowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1465553521-27303-35-git-send-email-k.kozlowski@samsung.com \
--to=k.kozlowski@samsung.com \
--cc=akpm@linux-foundation.org \
--cc=b.zolnierkie@samsung.com \
--cc=egtvedt@samfundet.no \
--cc=hch@infradead.org \
--cc=jonas@southpole.se \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).