Thread (31 messages) 31 messages, 9 authors, 2012-04-23

RE: [PATCH 3/9] dmaengine: add private header file

flat view
STALE5286d REVIEWED: 6 (6M)

From: H Hartley Sweeten <hidden>
Date: 2012-03-07 00:47:54
Also in: linux-arm-kernel

Revision v2 of 4 in this series; 2 review trailers.

Revisions (4)
  1. v1 [diff vs current]
  2. v1 [diff vs current]
  3. v2
  4. v2 current
On Tuesday, March 06, 2012 3:34 PM, Russell King wrote:
Add a local private header file to contain definitions and declarations
which should only be used by DMA engine drivers.

We also fix linux/dmaengine.h to use LINUX_DMAENGINE_H to guard against
multiple inclusion.

Signed-off-by: Russell King <redacted>
---
<snip>
 drivers/dma/dmaengine.h     |   10 ++++++++++
<snip>
 drivers/dma/ep93xx_dma.c    |    2 ++
<snip>
 include/linux/dmaengine.h   |    4 ++--
<snip>
quoted hunk ↗ jump to hunk
diff --git a/drivers/dma/dmaengine.h b/drivers/dma/dmaengine.h
new file mode 100644
index 0000000..968570d
--- /dev/null
+++ b/drivers/dma/dmaengine.h
@@ -0,0 +1,10 @@
+/*
+ * The contents of this file are private to DMA engine drivers, and is n=
ot
quoted hunk ↗ jump to hunk
+ * part of the API to be used by DMA engine users.
+ */
+#ifndef DMAENGINE_H
+#define DMAENGINE_H
+
+#include <linux/dmaengine.h>
+
+#endif
<snip>
quoted hunk ↗ jump to hunk
diff --git a/drivers/dma/ep93xx_dma.c b/drivers/dma/ep93xx_dma.c
index bc45787..3260198 100644
--- a/drivers/dma/ep93xx_dma.c
+++ b/drivers/dma/ep93xx_dma.c
@@ -28,6 +28,8 @@
=20
 #include <mach/dma.h>
=20
+#include "dmaengine.h"
+
 /* M2P registers */
 #define M2P_CONTROL			0x0000
 #define M2P_CONTROL_STALLINT		BIT(0)
<snip>
quoted hunk ↗ jump to hunk
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index 41d0f92..4b17ca8 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -18,8 +18,8 @@
  * The full GNU General Public License is included in this distribution =
in the
  * file called COPYING.
  */
-#ifndef DMAENGINE_H
-#define DMAENGINE_H
+#ifndef LINUX_DMAENGINE_H
+#define LINUX_DMAENGINE_H
=20
 #include <linux/device.h>
 #include <linux/uio.h>
For ep93xx:

Tested-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help