aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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);
135 135
136struct dma_channel { 136struct 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);
191int dma_channel_active(unsigned int channel); /* check if a channel is in use */ 191int dma_channel_active(unsigned int channel); /* check if a channel is in use */
192void disable_dma(unsigned int channel); 192void disable_dma(unsigned int channel);
193void enable_dma(unsigned int channel); 193void enable_dma(unsigned int channel);
194int request_dma(unsigned int channel, char *device_id); 194int request_dma(unsigned int channel, const char *device_id);
195int set_dma_callback(unsigned int channel, dma_interrupt_t callback, 195int set_dma_callback(unsigned int channel, dma_interrupt_t callback,
196 void *data); 196 void *data);
197void dma_disable_irq(unsigned int channel); 197void 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 *-----------------------------------------------------------------------------*/
119int request_dma(unsigned int channel, char *device_id) 119int 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