diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/dma/shdma.c | 4 | ||||
-rw-r--r-- | drivers/dma/shdma.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c index e5588f4868ca..83605389fb56 100644 --- a/drivers/dma/shdma.c +++ b/drivers/dma/shdma.c | |||
@@ -44,7 +44,7 @@ enum sh_dmae_desc_status { | |||
44 | #define LOG2_DEFAULT_XFER_SIZE 2 | 44 | #define LOG2_DEFAULT_XFER_SIZE 2 |
45 | 45 | ||
46 | /* A bitmask with bits enough for enum sh_dmae_slave_chan_id */ | 46 | /* A bitmask with bits enough for enum sh_dmae_slave_chan_id */ |
47 | static unsigned long sh_dmae_slave_used[BITS_TO_LONGS(SHDMA_SLAVE_NUMBER)]; | 47 | static unsigned long sh_dmae_slave_used[BITS_TO_LONGS(SH_DMA_SLAVE_NUMBER)]; |
48 | 48 | ||
49 | static void sh_dmae_chan_ld_cleanup(struct sh_dmae_chan *sh_chan, bool all); | 49 | static void sh_dmae_chan_ld_cleanup(struct sh_dmae_chan *sh_chan, bool all); |
50 | 50 | ||
@@ -274,7 +274,7 @@ static struct sh_dmae_slave_config *sh_dmae_find_slave( | |||
274 | struct sh_dmae_pdata *pdata = shdev->pdata; | 274 | struct sh_dmae_pdata *pdata = shdev->pdata; |
275 | int i; | 275 | int i; |
276 | 276 | ||
277 | if (param->slave_id >= SHDMA_SLAVE_NUMBER) | 277 | if (param->slave_id >= SH_DMA_SLAVE_NUMBER) |
278 | return NULL; | 278 | return NULL; |
279 | 279 | ||
280 | for (i = 0; i < pdata->slave_num; i++) | 280 | for (i = 0; i < pdata->slave_num; i++) |
diff --git a/drivers/dma/shdma.h b/drivers/dma/shdma.h index 153609a1e96c..d7ddf6f47154 100644 --- a/drivers/dma/shdma.h +++ b/drivers/dma/shdma.h | |||
@@ -19,6 +19,7 @@ | |||
19 | 19 | ||
20 | #include <asm/dmaengine.h> | 20 | #include <asm/dmaengine.h> |
21 | 21 | ||
22 | #define SH_DMA_SLAVE_NUMBER 256 | ||
22 | #define SH_DMA_TCR_MAX 0x00FFFFFF /* 16MB */ | 23 | #define SH_DMA_TCR_MAX 0x00FFFFFF /* 16MB */ |
23 | 24 | ||
24 | struct device; | 25 | struct device; |