aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin/kernel
diff options
context:
space:
mode:
authorMike Frysinger <vapier.adi@gmail.com>2009-01-07 10:14:39 -0500
committerBryan Wu <cooloney@kernel.org>2009-01-07 10:14:39 -0500
commit211daf9d7252288ad88ab6b97268a8d828e6b696 (patch)
treeb86f5b2aae10a1c6d91e4d2d6ef82374cb42764a /arch/blackfin/kernel
parent3e706cfcce591e50163d6e979b7fc64d91ced6a0 (diff)
Blackfin arch: rename MAX_BLACKFIN_DMA_CHANNEL to MAX_DMA_CHANNELS to match everyone else
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com> Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch/blackfin/kernel')
-rw-r--r--arch/blackfin/kernel/bfin_dma_5xx.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/blackfin/kernel/bfin_dma_5xx.c b/arch/blackfin/kernel/bfin_dma_5xx.c
index 22bce17bbb02..ad936843ecda 100644
--- a/arch/blackfin/kernel/bfin_dma_5xx.c
+++ b/arch/blackfin/kernel/bfin_dma_5xx.c
@@ -44,7 +44,7 @@
44 * Global Variables 44 * Global Variables
45***************************************************************************/ 45***************************************************************************/
46 46
47static struct dma_channel dma_ch[MAX_BLACKFIN_DMA_CHANNEL]; 47static struct dma_channel dma_ch[MAX_DMA_CHANNELS];
48 48
49/*------------------------------------------------------------------------------ 49/*------------------------------------------------------------------------------
50 * Set the Buffer Clear bit in the Configuration register of specific DMA 50 * Set the Buffer Clear bit in the Configuration register of specific DMA
@@ -63,7 +63,7 @@ static int __init blackfin_dma_init(void)
63 63
64 printk(KERN_INFO "Blackfin DMA Controller\n"); 64 printk(KERN_INFO "Blackfin DMA Controller\n");
65 65
66 for (i = 0; i < MAX_BLACKFIN_DMA_CHANNEL; i++) { 66 for (i = 0; i < MAX_DMA_CHANNELS; i++) {
67 dma_ch[i].chan_status = DMA_CHANNEL_FREE; 67 dma_ch[i].chan_status = DMA_CHANNEL_FREE;
68 dma_ch[i].regs = dma_io_base_addr[i]; 68 dma_ch[i].regs = dma_io_base_addr[i];
69 mutex_init(&(dma_ch[i].dmalock)); 69 mutex_init(&(dma_ch[i].dmalock));
@@ -87,7 +87,7 @@ static int proc_dma_show(struct seq_file *m, void *v)
87{ 87{
88 int i; 88 int i;
89 89
90 for (i = 0 ; i < MAX_BLACKFIN_DMA_CHANNEL; ++i) 90 for (i = 0 ; i < MAX_DMA_CHANNELS; ++i)
91 if (dma_ch[i].chan_status != DMA_CHANNEL_FREE) 91 if (dma_ch[i].chan_status != DMA_CHANNEL_FREE)
92 seq_printf(m, "%2d: %s\n", i, dma_ch[i].device_id); 92 seq_printf(m, "%2d: %s\n", i, dma_ch[i].device_id);
93 93
@@ -175,7 +175,7 @@ EXPORT_SYMBOL(request_dma);
175int set_dma_callback(unsigned int channel, dma_interrupt_t callback, void *data) 175int set_dma_callback(unsigned int channel, dma_interrupt_t callback, void *data)
176{ 176{
177 BUG_ON(!(dma_ch[channel].chan_status != DMA_CHANNEL_FREE 177 BUG_ON(!(dma_ch[channel].chan_status != DMA_CHANNEL_FREE
178 && channel < MAX_BLACKFIN_DMA_CHANNEL)); 178 && channel < MAX_DMA_CHANNELS));
179 179
180 if (callback != NULL) { 180 if (callback != NULL) {
181 int ret_val; 181 int ret_val;
@@ -200,7 +200,7 @@ void free_dma(unsigned int channel)
200{ 200{
201 pr_debug("freedma() : BEGIN \n"); 201 pr_debug("freedma() : BEGIN \n");
202 BUG_ON(!(dma_ch[channel].chan_status != DMA_CHANNEL_FREE 202 BUG_ON(!(dma_ch[channel].chan_status != DMA_CHANNEL_FREE
203 && channel < MAX_BLACKFIN_DMA_CHANNEL)); 203 && channel < MAX_DMA_CHANNELS));
204 204
205 /* Halt the DMA */ 205 /* Halt the DMA */
206 disable_dma(channel); 206 disable_dma(channel);
@@ -418,7 +418,7 @@ int blackfin_dma_suspend(void)
418#ifdef CONFIG_BF561 /* IMDMA channels doesn't have a PERIPHERAL_MAP */ 418#ifdef CONFIG_BF561 /* IMDMA channels doesn't have a PERIPHERAL_MAP */
419 for (i = 0; i <= CH_MEM_STREAM3_SRC; i++) { 419 for (i = 0; i <= CH_MEM_STREAM3_SRC; i++) {
420#else 420#else
421 for (i = 0; i < MAX_BLACKFIN_DMA_CHANNEL; i++) { 421 for (i = 0; i < MAX_DMA_CHANNELS; i++) {
422#endif 422#endif
423 if (dma_ch[i].chan_status == DMA_CHANNEL_ENABLED) { 423 if (dma_ch[i].chan_status == DMA_CHANNEL_ENABLED) {
424 printk(KERN_ERR "DMA Channel %d failed to suspend\n", i); 424 printk(KERN_ERR "DMA Channel %d failed to suspend\n", i);
@@ -438,7 +438,7 @@ void blackfin_dma_resume(void)
438#ifdef CONFIG_BF561 /* IMDMA channels doesn't have a PERIPHERAL_MAP */ 438#ifdef CONFIG_BF561 /* IMDMA channels doesn't have a PERIPHERAL_MAP */
439 for (i = 0; i <= CH_MEM_STREAM3_SRC; i++) 439 for (i = 0; i <= CH_MEM_STREAM3_SRC; i++)
440#else 440#else
441 for (i = 0; i < MAX_BLACKFIN_DMA_CHANNEL; i++) 441 for (i = 0; i < MAX_DMA_CHANNELS; i++)
442#endif 442#endif
443 dma_ch[i].regs->peripheral_map = dma_ch[i].saved_peripheral_map; 443 dma_ch[i].regs->peripheral_map = dma_ch[i].saved_peripheral_map;
444} 444}