Title: [5808] trunk/arch/blackfin: drop irq_callback from struct dma_channel -- the irq member already serves the same purpose
- Revision
- 5808
- Author
- vapier
- Date
- 2008-12-04 02:06:33 -0600 (Thu, 04 Dec 2008)
Log Message
drop irq_callback from struct dma_channel -- the irq member already serves the same purpose
Modified Paths
Diff
Modified: trunk/arch/blackfin/include/asm/dma.h (5807 => 5808)
--- trunk/arch/blackfin/include/asm/dma.h 2008-12-04 08:03:18 UTC (rev 5807)
+++ trunk/arch/blackfin/include/asm/dma.h 2008-12-04 08:06:33 UTC (rev 5808)
@@ -118,7 +118,6 @@
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;
Modified: trunk/arch/blackfin/kernel/bfin_dma_5xx.c (5807 => 5808)
--- trunk/arch/blackfin/kernel/bfin_dma_5xx.c 2008-12-04 08:03:18 UTC (rev 5807)
+++ trunk/arch/blackfin/kernel/bfin_dma_5xx.c 2008-12-04 08:06:33 UTC (rev 5808)
@@ -140,7 +140,7 @@
#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 @@
"Request irq in DMA engine failed.\n");
return -EPERM;
}
- dma_ch[channel].irq_callback = callback;
}
return 0;
}
@@ -185,7 +184,7 @@
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 */
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
