---

yaml --- r: 127101 b: refs/heads/master c: 68532bd h: refs/heads/master i: 127099: 0fde67e v: v3
git-mirror · Jan 7, 2009 · fd5ecc8 · fd5ecc8
1 parent 7fde508
commit fd5ecc8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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));