diff options
author | Michael McTernan <mmcternan@airvana.com> | 2009-01-07 10:14:38 -0500 |
---|---|---|
committer | Bryan Wu <cooloney@kernel.org> | 2009-01-07 10:14:38 -0500 |
commit | 99532fd2a0955e609c53b587b4df79ae40b4a6c7 (patch) | |
tree | 9423cd0a457c86c1dfc3a0db670ca03e124e1deb | |
parent | d642a8ad55baee675b14dc4f36fc871a2588c7d1 (diff) |
Blackfin arch: add const to some function prototype and struct dma_channel
Signed-off-by: Michael McTernan <mmcternan@airvana.com>
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
-rw-r--r-- | arch/blackfin/include/asm/dma.h | 4 | ||||
-rw-r--r-- | arch/blackfin/kernel/bfin_dma_5xx.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/blackfin/include/asm/dma.h b/arch/blackfin/include/asm/dma.h index 9befcbae00b9..3aa4dd3e5fe8 100644 --- a/arch/blackfin/include/asm/dma.h +++ b/arch/blackfin/include/asm/dma.h | |||
@@ -135,7 +135,7 @@ typedef irqreturn_t(*dma_interrupt_t) (int irq, void *dev_id); | |||
135 | 135 | ||
136 | struct dma_channel { | 136 | struct dma_channel { |
137 | struct mutex dmalock; | 137 | struct mutex dmalock; |
138 | char *device_id; | 138 | const char *device_id; |
139 | enum dma_chan_status chan_status; | 139 | enum dma_chan_status chan_status; |
140 | struct dma_register *regs; | 140 | struct dma_register *regs; |
141 | struct dmasg *sg; /* large mode descriptor */ | 141 | struct dmasg *sg; /* large mode descriptor */ |
@@ -191,7 +191,7 @@ void free_dma(unsigned int channel); | |||
191 | int dma_channel_active(unsigned int channel); /* check if a channel is in use */ | 191 | int dma_channel_active(unsigned int channel); /* check if a channel is in use */ |
192 | void disable_dma(unsigned int channel); | 192 | void disable_dma(unsigned int channel); |
193 | void enable_dma(unsigned int channel); | 193 | void enable_dma(unsigned int channel); |
194 | int request_dma(unsigned int channel, char *device_id); | 194 | int request_dma(unsigned int channel, const char *device_id); |
195 | int set_dma_callback(unsigned int channel, dma_interrupt_t callback, | 195 | int set_dma_callback(unsigned int channel, dma_interrupt_t callback, |
196 | void *data); | 196 | void *data); |
197 | void dma_disable_irq(unsigned int channel); | 197 | void dma_disable_irq(unsigned int channel); |
diff --git a/arch/blackfin/kernel/bfin_dma_5xx.c b/arch/blackfin/kernel/bfin_dma_5xx.c index 2625aa20a92c..22bce17bbb02 100644 --- a/arch/blackfin/kernel/bfin_dma_5xx.c +++ b/arch/blackfin/kernel/bfin_dma_5xx.c | |||
@@ -116,7 +116,7 @@ late_initcall(proc_dma_init); | |||
116 | /*------------------------------------------------------------------------------ | 116 | /*------------------------------------------------------------------------------ |
117 | * Request the specific DMA channel from the system. | 117 | * Request the specific DMA channel from the system. |
118 | *-----------------------------------------------------------------------------*/ | 118 | *-----------------------------------------------------------------------------*/ |
119 | int request_dma(unsigned int channel, char *device_id) | 119 | int request_dma(unsigned int channel, const char *device_id) |
120 | { | 120 | { |
121 | pr_debug("request_dma() : BEGIN \n"); | 121 | pr_debug("request_dma() : BEGIN \n"); |
122 | 122 | ||