lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Blackfin arch: add const to some function prototype and struct dma_channel

Browse Source 
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>
This commit is contained in:
Michael McTernan
2009-01-07 23:14:38 +08:00
committed by Bryan Wu
parent d642a8ad55
commit 99532fd2a0
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/blackfin/include/asm/dma.h
View File

@@ -135,7 +135,7 @@ typedef irqreturn_t(*dma_interrupt_t) (int irq, void *dev_id);
struct dma_channel { struct dma_channel {
struct mutex dmalock; struct mutex dmalock;
char *device_id; const char *device_id;
enum dma_chan_status chan_status; enum dma_chan_status chan_status;
struct dma_register *regs; struct dma_register *regs;
struct dmasg *sg; /* large mode descriptor */ 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 */ int dma_channel_active(unsigned int channel); /* check if a channel is in use */
void disable_dma(unsigned int channel); void disable_dma(unsigned int channel);
void enable_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, int set_dma_callback(unsigned int channel, dma_interrupt_t callback,
void *data); void *data);
void dma_disable_irq(unsigned int channel); void dma_disable_irq(unsigned int channel);

2
arch/blackfin/kernel/bfin_dma_5xx.c
View File

@@ -116,7 +116,7 @@ late_initcall(proc_dma_init);
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
* Request the specific DMA channel from the system. * 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"); pr_debug("request_dma() : BEGIN \n");