From fd5ecc87a146ddf4e3cde2734cf05c574e350db6 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 7 Jan 2009 23:14:38 +0800 Subject: [PATCH] --- yaml --- r: 127101 b: refs/heads/master c: 68532bdac35c9cc467c14cb9ea675835e07b5619 h: refs/heads/master i: 127099: 0fde67eef6beaa7f69984bea6c7b78bd99952cd1 v: v3 --- [refs] | 2 +- trunk/arch/blackfin/include/asm/dma.h | 6 ++---- trunk/arch/blackfin/kernel/bfin_dma_5xx.c | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index d7b7ec7b8d89..eaba4fe45619 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 259fea42e66e62226c310a6646049b99912af7cc +refs/heads/master: 68532bdac35c9cc467c14cb9ea675835e07b5619 diff --git a/trunk/arch/blackfin/include/asm/dma.h b/trunk/arch/blackfin/include/asm/dma.h index ca8252ab7a10..045bd1ce72bf 100644 --- a/trunk/arch/blackfin/include/asm/dma.h +++ b/trunk/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/trunk/arch/blackfin/kernel/bfin_dma_5xx.c b/trunk/arch/blackfin/kernel/bfin_dma_5xx.c index dff979bf8541..b6cf643f5935 100644 --- a/trunk/arch/blackfin/kernel/bfin_dma_5xx.c +++ b/trunk/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));