---

yaml --- r: 127102 b: refs/heads/master c: 9b01140 h: refs/heads/master v: v3
git-mirror · Jan 7, 2009 · 464d9e4 · 464d9e4
1 parent fd5ecc8
commit 464d9e4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68532bdac35c9cc467c14cb9ea675835e07b5619
+refs/heads/master: 9b011407d653b92191aa4993222523039d44af52
diff --git a/trunk/arch/blackfin/include/asm/dma.h b/trunk/arch/blackfin/include/asm/dma.h
@@ -118,7 +118,6 @@ struct dma_channel {
 	struct dmasg *sg;		/* large mode descriptor */
 	unsigned int ctrl_num;	/* controller number */
 	unsigned int irq;
-	irq_handler_t irq_callback;
 	void *data;
 	unsigned int dma_enable_flag;
 	unsigned int loopback_flag;

diff --git a/trunk/arch/blackfin/kernel/bfin_dma_5xx.c b/trunk/arch/blackfin/kernel/bfin_dma_5xx.c
@@ -140,7 +140,7 @@ int request_dma(unsigned int channel, const char *device_id)
 #endif
 
 	dma_ch[channel].device_id = device_id;
-	dma_ch[channel].irq_callback = NULL;
+	dma_ch[channel].irq = 0;
 
 	/* This is to be enabled by putting a restriction -
 	 * you have to request DMA, before doing any operations on
@@ -169,7 +169,6 @@ int set_dma_callback(unsigned int channel, irq_handler_t callback, void *data)
 			       "Request irq in DMA engine failed.\n");
 			return -EPERM;
 		}
-		dma_ch[channel].irq_callback = callback;
 	}
 	return 0;
 }
@@ -185,7 +184,7 @@ void free_dma(unsigned int channel)
 	disable_dma(channel);
 	clear_dma_buffer(channel);
 
-	if (dma_ch[channel].irq_callback != NULL)
+	if (dma_ch[channel].irq)
 		free_irq(dma_ch[channel].irq, dma_ch[channel].data);
 
 	/* Clear the DMA Variable in the Channel */