From: Krzysztof Kozlowski <k.kozlowski@samsung.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, hch@infradead.org,
Krzysztof Kozlowski <k.kozlowski@samsung.com>,
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
Richard Kuo <rkuo@codeaurora.org>,
linux-hexagon@vger.kernel.org
Subject: [PATCH v6 27/46] hexagon: dma-mapping: Use unsigned long for dma_attrs
Date: Wed, 13 Jul 2016 10:41:18 +0200 [thread overview]
Message-ID: <1468399300-5399-27-git-send-email-k.kozlowski@samsung.com> (raw)
In-Reply-To: <1468399300-5399-26-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>\
[for hexagon]
Acked-By: Richard Kuo <rkuo@codeaurora.org>
---
arch/hexagon/include/asm/dma-mapping.h | 1 -
arch/hexagon/kernel/dma.c | 8 ++++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/arch/hexagon/include/asm/dma-mapping.h b/arch/hexagon/include/asm/dma-mapping.h
index aa6203464520..7ef58df909fc 100644
--- a/arch/hexagon/include/asm/dma-mapping.h
+++ b/arch/hexagon/include/asm/dma-mapping.h
@@ -26,7 +26,6 @@
#include <linux/mm.h>
#include <linux/scatterlist.h>
#include <linux/dma-debug.h>
-#include <linux/dma-attrs.h>
#include <asm/io.h>
struct device;
diff --git a/arch/hexagon/kernel/dma.c b/arch/hexagon/kernel/dma.c
index 9e3ddf792bd3..b9017785fb71 100644
--- a/arch/hexagon/kernel/dma.c
+++ b/arch/hexagon/kernel/dma.c
@@ -51,7 +51,7 @@ static struct gen_pool *coherent_pool;
static void *hexagon_dma_alloc_coherent(struct device *dev, size_t size,
dma_addr_t *dma_addr, gfp_t flag,
- struct dma_attrs *attrs)
+ unsigned long attrs)
{
void *ret;
@@ -84,7 +84,7 @@ static void *hexagon_dma_alloc_coherent(struct device *dev, size_t size,
}
static void hexagon_free_coherent(struct device *dev, size_t size, void *vaddr,
- dma_addr_t dma_addr, struct dma_attrs *attrs)
+ dma_addr_t dma_addr, unsigned long attrs)
{
gen_pool_free(coherent_pool, (unsigned long) vaddr, size);
}
@@ -105,7 +105,7 @@ static int check_addr(const char *name, struct device *hwdev,
static int hexagon_map_sg(struct device *hwdev, struct scatterlist *sg,
int nents, enum dma_data_direction dir,
- struct dma_attrs *attrs)
+ unsigned long attrs)
{
struct scatterlist *s;
int i;
@@ -172,7 +172,7 @@ static inline void dma_sync(void *addr, size_t size,
static dma_addr_t hexagon_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 bus = page_to_phys(page) + offset;
WARN_ON(size == 0);
--
1.9.1
next prev parent reply other threads:[~2016-07-13 8:46 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-13 8:39 [PATCH v6 00/46] dma-mapping: Use unsigned long for dma_attrs Krzysztof Kozlowski
2016-07-13 8:40 ` [PATCH v6 01/46] [media] mtk-vcodec: Remove unused dma_attrs Krzysztof Kozlowski
2016-07-13 8:40 ` [PATCH v6 02/46] dma-mapping: Use unsigned long for dma_attrs Krzysztof Kozlowski
2016-07-13 8:40 ` [PATCH v6 03/46] alpha: " Krzysztof Kozlowski
2016-07-13 8:40 ` [PATCH v6 04/46] arc: " Krzysztof Kozlowski
2016-07-13 8:40 ` [PATCH v6 05/46] ARM: " Krzysztof Kozlowski
2016-07-13 8:40 ` [PATCH v6 06/46] arm64: " Krzysztof Kozlowski
2016-07-13 8:40 ` [PATCH v6 07/46] avr32: " Krzysztof Kozlowski
2016-07-13 8:40 ` [PATCH v6 08/46] blackfin: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 09/46] c6x: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 10/46] cris: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 11/46] frv: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 12/46] drm/exynos: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 13/46] drm/mediatek: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 14/46] drm/msm: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 15/46] drm/nouveau: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 16/46] drm/rockship: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 17/46] infiniband: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 18/46] iommu: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 19/46] [media] " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 20/46] xen: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 21/46] swiotlb: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 22/46] powerpc: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 23/46] video: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 24/46] x86: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 25/46] iommu: intel: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 26/46] h8300: " Krzysztof Kozlowski
2016-07-13 8:41 ` Krzysztof Kozlowski [this message]
2016-07-13 8:41 ` [PATCH v6 28/46] ia64: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 29/46] m68k: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 30/46] metag: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 31/46] microblaze: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 32/46] mips: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 33/46] mn10300: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 34/46] nios2: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 35/46] openrisc: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 36/46] parisc: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 37/46] misc: mic: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 38/46] s390: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 39/46] sh: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 40/46] sparc: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 41/46] tile: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 42/46] unicore32: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 43/46] xtensa: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 44/46] remoteproc: qcom: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 45/46] dma-mapping: Remove dma_get_attr Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 46/46] dma-mapping: Document the DMA attributes next to the declaration Krzysztof Kozlowski
2016-07-13 16:51 ` [PATCH v6 44/46] remoteproc: qcom: Use unsigned long for dma_attrs Bjorn Andersson
2016-07-13 10:37 ` [PATCH v6 17/46] infiniband: dma-mapping: " Bart Van Assche
2016-07-13 10:47 ` Krzysztof Kozlowski
2016-07-13 10:56 ` Bart Van Assche
2016-07-13 11:03 ` Krzysztof Kozlowski
2016-07-13 11:14 ` [PATCH v6.1] " Krzysztof Kozlowski
2016-07-13 11:17 ` Krzysztof Kozlowski
2016-07-13 11:56 ` [PATCH v6.2] " Krzysztof Kozlowski
2016-07-13 12:29 ` Bart Van Assche
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=1468399300-5399-27-git-send-email-k.kozlowski@samsung.com \
--to=k.kozlowski@samsung.com \
--cc=akpm@linux-foundation.org \
--cc=b.zolnierkie@samsung.com \
--cc=hch@infradead.org \
--cc=linux-hexagon@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rkuo@codeaurora.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).