summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael McTernan <mmcternan@airvana.com>2009-01-07 23:14:38 +0800
committerBryan Wu <cooloney@kernel.org>2009-01-07 23:14:38 +0800
commit99532fd2a0955e609c53b587b4df79ae40b4a6c7 (patch)
tree9423cd0a457c86c1dfc3a0db670ca03e124e1deb
parentd642a8ad55baee675b14dc4f36fc871a2588c7d1 (diff)
downloadblackbird-op-linux-99532fd2a0955e609c53b587b4df79ae40b4a6c7.tar.gz
blackbird-op-linux-99532fd2a0955e609c53b587b4df79ae40b4a6c7.zip
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.h4
-rw-r--r--arch/blackfin/kernel/bfin_dma_5xx.c2
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);
struct dma_channel {
struct mutex dmalock;
- char *device_id;
+ const char *device_id;
enum dma_chan_status chan_status;
struct dma_register *regs;
struct dmasg *sg; /* large mode descriptor */
@@ -191,7 +191,7 @@ void free_dma(unsigned int channel);
int dma_channel_active(unsigned int channel); /* check if a channel is in use */
void disable_dma(unsigned int channel);
void enable_dma(unsigned int channel);
-int request_dma(unsigned int channel, char *device_id);
+int request_dma(unsigned int channel, const char *device_id);
int set_dma_callback(unsigned int channel, dma_interrupt_t callback,
void *data);
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);
/*------------------------------------------------------------------------------
* Request the specific DMA channel from the system.
*-----------------------------------------------------------------------------*/
-int request_dma(unsigned int channel, char *device_id)
+int request_dma(unsigned int channel, const char *device_id)
{
pr_debug("request_dma() : BEGIN \n");
OpenPOWER on IntegriCloud