diff options
| author | Mike Frysinger | 2009-01-07 23:14:38 +0800 |
|---|---|---|
| committer | Bryan Wu | 2009-01-07 23:14:38 +0800 |
| commit | 68532bdac35c9cc467c14cb9ea675835e07b5619 (patch) | |
| tree | 0a1e85c021568a8655fa14e1869f2e8ec9cf6cbc /arch | |
| parent | 259fea42e66e62226c310a6646049b99912af7cc (diff) | |
Blackfin arch: drop custom dma_interrupt_t and just use irq_handler_t
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/blackfin/include/asm/dma.h | 6 | ||||
| -rw-r--r-- | arch/blackfin/kernel/bfin_dma_5xx.c | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/arch/blackfin/include/asm/dma.h b/arch/blackfin/include/asm/dma.h index ca8252ab7a10..045bd1ce72bf 100644 --- a/arch/blackfin/include/asm/dma.h +++ b/arch/blackfin/include/asm/dma.h @@ -110,8 +110,6 @@ struct dma_register { }; -typedef irqreturn_t(*dma_interrupt_t) (int irq, void *dev_id); - struct dma_channel { struct mutex dmalock; const char *device_id; @@ -120,7 +118,7 @@ struct dma_channel { struct dmasg *sg; /* large mode descriptor */ unsigned int ctrl_num; /* controller number */ unsigned int irq; - dma_interrupt_t irq_callback; + irq_handler_t irq_callback; void *data; unsigned int dma_enable_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 enable_dma(unsigned int channel); 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 dma_disable_irq(unsigned int channel); void dma_enable_irq(unsigned int channel); diff --git a/arch/blackfin/kernel/bfin_dma_5xx.c b/arch/blackfin/kernel/bfin_dma_5xx.c index dff979bf8541..b6cf643f5935 100644 --- a/arch/blackfin/kernel/bfin_dma_5xx.c +++ b/arch/blackfin/kernel/bfin_dma_5xx.c @@ -151,7 +151,7 @@ int request_dma(unsigned int channel, const char *device_id) } 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 && channel < MAX_DMA_CHANNELS)); |