Thread (15 messages) 15 messages, 3 authors, 2012-03-06

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

flat view
STALE5333d SUPERSEDED

From: H Hartley Sweeten <hidden>
Date: 2012-03-05 23:28:50
Also in: linux-arm-kernel

Revision v1 of 4 in this series.

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

Signed-off-by: Russell King <redacted>
---
 drivers/dma/amba-pl08x.c    |    2 ++
 drivers/dma/at_hdmac.c      |    1 +
 drivers/dma/coh901318.c     |    1 +
 drivers/dma/dmaengine.h     |   10 ++++++++++
 drivers/dma/dw_dmac.c       |    1 +
 drivers/dma/ep93xx_dma.c    |    2 ++
 drivers/dma/fsldma.c        |    1 +
 drivers/dma/imx-dma.c       |    2 ++
 drivers/dma/imx-sdma.c      |    2 ++
 drivers/dma/intel_mid_dma.c |    2 ++
 drivers/dma/ioat/dma.c      |    2 ++
 drivers/dma/ioat/dma_v2.c   |    2 ++
 drivers/dma/iop-adma.c      |    2 ++
 drivers/dma/ipu/ipu_idmac.c |    1 +
 drivers/dma/mpc512x_dma.c   |    2 ++
 drivers/dma/mv_xor.c        |    2 ++
 drivers/dma/mxs-dma.c       |    2 ++
 drivers/dma/pch_dma.c       |    2 ++
 drivers/dma/pl330.c         |    2 ++
 drivers/dma/ppc4xx/adma.c   |    1 +
 drivers/dma/shdma.c         |    2 ++
 drivers/dma/ste_dma40.c     |    1 +
 drivers/dma/timb_dma.c      |    2 ++
 drivers/dma/txx9dmac.c      |    2 ++
 24 files changed, 49 insertions(+), 0 deletions(-)
 create mode 100644 drivers/dma/dmaengine.h
diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
index 2b5121f..87475cb 100644
--- a/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
@@ -85,6 +85,8 @@
 #include <linux/slab.h>
 #include <asm/hardware/pl080.h>
=20
+#include "dmaengine.h"
+
 #define DRIVER_NAME	"pl08xdmac"
=20
 static struct amba_driver pl08x_amba_driver;
diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
index 6baf5d7..ce26ba3 100644
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
@@ -27,6 +27,7 @@
 #include <linux/of_device.h>
=20
 #include "at_hdmac_regs.h"
+#include "dmaengine.h"
=20
 /*
  * Glossary
diff --git a/drivers/dma/coh901318.c b/drivers/dma/coh901318.c
index 521434b..fb0d124 100644
--- a/drivers/dma/coh901318.c
+++ b/drivers/dma/coh901318.c
@@ -24,6 +24,7 @@
 #include <mach/coh901318.h>
=20
 #include "coh901318_lli.h"
+#include "dmaengine.h"
=20
 #define COHC_2_DEV(cohc) (&cohc->chan.dev->device)
=20
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
Russell,

You have an include issue here.

All the dmaengine drivers have:

#include <linux/dmaengine.h>

Which is guarded with

#ifndef DMAENGINE_H
#define DMAENGINE_H

...

#endif

This is the same guard you are using in the private "dmaengine.h". And it
also includes <linux/dmaengine.h> again...

This doesn't compile as-is because the "dmaengine.h" file is not used due
to the #ifndef...

Regards,
Hartley
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help