summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2012-05-09 17:09:14 +0200
committerVinod Koul <vinod.koul@linux.intel.com>2012-07-13 09:13:07 +0530
commit5902c9a7a2a9c2520af54af1ba7a9c7831664a17 (patch)
tree7f856daff0289a8e3fc56a7a660a89f934f38425
parent9a7b8e002e331d0599127f16613c32f425a14f2c (diff)
downloadlinux-stable-5902c9a7a2a9c2520af54af1ba7a9c7831664a17.tar.gz
linux-stable-5902c9a7a2a9c2520af54af1ba7a9c7831664a17.tar.bz2
linux-stable-5902c9a7a2a9c2520af54af1ba7a9c7831664a17.zip
dma: shdma: prepare for conversion to the shdma base library
By placing an anonymous union at the top of struct sh_dmae_slave we can transparently prepare all device and client drivers for the upcoming shdma-base conversion. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
-rw-r--r--include/linux/sh_dma.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/sh_dma.h b/include/linux/sh_dma.h
index 425450b980b8..e081e8e8d109 100644
--- a/include/linux/sh_dma.h
+++ b/include/linux/sh_dma.h
@@ -10,12 +10,16 @@
#ifndef SH_DMA_H
#define SH_DMA_H
-#include <linux/list.h>
#include <linux/dmaengine.h>
+#include <linux/list.h>
+#include <linux/shdma-base.h>
/* Used by slave DMA clients to request DMA to/from a specific peripheral */
struct sh_dmae_slave {
- unsigned int slave_id; /* Set by the platform */
+ union {
+ unsigned int slave_id; /* Set by the platform */
+ struct shdma_slave shdma_slave;
+ };
struct device *dma_dev; /* Set by the platform */
const struct sh_dmae_slave_config *config; /* Set by the driver */
};