FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-22 01:10:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Blackfin arch: drop custom dma_interrupt_t and just use irq_handler_t

Browse Source 
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
This commit is contained in:
Mike Frysinger 2009-01-07 23:14:38 +08:00 committed by Bryan Wu
parent 259fea42e6
commit 68532bdac3
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,8 +110,6 @@ struct dma_register {
}; };
typedef irqreturn_t(*dma_interrupt_t) (int irq, void *dev_id);
struct dma_channel { struct dma_channel {
struct mutex dmalock; struct mutex dmalock;
const char *device_id; const char *device_id;
@ -120,7 +118,7 @@ struct dma_channel {
struct dmasg *sg; /* large mode descriptor */ struct dmasg *sg; /* large mode descriptor */
unsigned int ctrl_num; /* controller number */ unsigned int ctrl_num; /* controller number */
unsigned int irq; unsigned int irq;
dma_interrupt_t irq_callback; irq_handler_t irq_callback;
void *data; void *data;
unsigned int dma_enable_flag; unsigned int dma_enable_flag;
unsigned int loopback_flag; unsigned int loopback_flag;
@ -171,7 +169,7 @@ 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, const 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, irq_handler_t callback,
void *data); void *data);
void dma_disable_irq(unsigned int channel); void dma_disable_irq(unsigned int channel);
void dma_enable_irq(unsigned int channel); void dma_enable_irq(unsigned int channel);

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

@ -151,7 +151,7 @@ int request_dma(unsigned int channel, const char *device_id)
} }
EXPORT_SYMBOL(request_dma); EXPORT_SYMBOL(request_dma);
int set_dma_callback(unsigned int channel, dma_interrupt_t callback, void *data) int set_dma_callback(unsigned int channel, irq_handler_t callback, void *data)
{ {
BUG_ON(!(dma_ch[channel].chan_status != DMA_CHANNEL_FREE BUG_ON(!(dma_ch[channel].chan_status != DMA_CHANNEL_FREE
&& channel < MAX_DMA_CHANNELS)); && channel < MAX_DMA_CHANNELS));