summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2010-03-19 04:46:47 +0000
committerPaul Mundt <lethal@linux-sh.org>2010-03-23 17:19:39 +0900
commit02ca5083f60521d09f13224596564a405108bc4c (patch)
tree610eae56f7731208b00dd3b95b534a1877296c83 /drivers/dma
parent4bab9d426e6dbd9ea09330919a33d35d5faab400 (diff)
dmaengine: shdma: Common SH_DMA_SLAVE_NUMBER
Move SHDMA_SLAVE_NUMBER from asm/dmaengine.h to shdma.h. Set it to 256 to support a wide range of processors. The amount of memory consumed by this change is limited to 256 bits. While at it, rename to SH_DMA_SLAVE_NUMBER to match with the rest of the file. Signed-off-by: Magnus Damm <damm@opensource.se> Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/shdma.c4
-rw-r--r--drivers/dma/shdma.h1
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c
index e5588f4868c..83605389fb5 100644
--- a/drivers/dma/shdma.c
+++ b/drivers/dma/shdma.c
@@ -44,7 +44,7 @@ enum sh_dmae_desc_status {
#define LOG2_DEFAULT_XFER_SIZE 2
/* A bitmask with bits enough for enum sh_dmae_slave_chan_id */
-static unsigned long sh_dmae_slave_used[BITS_TO_LONGS(SHDMA_SLAVE_NUMBER)];
+static unsigned long sh_dmae_slave_used[BITS_TO_LONGS(SH_DMA_SLAVE_NUMBER)];
static void sh_dmae_chan_ld_cleanup(struct sh_dmae_chan *sh_chan, bool all);
@@ -274,7 +274,7 @@ static struct sh_dmae_slave_config *sh_dmae_find_slave(
struct sh_dmae_pdata *pdata = shdev->pdata;
int i;
- if (param->slave_id >= SHDMA_SLAVE_NUMBER)
+ if (param->slave_id >= SH_DMA_SLAVE_NUMBER)
return NULL;
for (i = 0; i < pdata->slave_num; i++)
diff --git a/drivers/dma/shdma.h b/drivers/dma/shdma.h
index 153609a1e96..d7ddf6f4715 100644
--- a/drivers/dma/shdma.h
+++ b/drivers/dma/shdma.h
@@ -19,6 +19,7 @@
#include <asm/dmaengine.h>
+#define SH_DMA_SLAVE_NUMBER 256
#define SH_DMA_TCR_MAX 0x00FFFFFF /* 16MB */
struct device;