Title: [5806] trunk/arch/blackfin: drop custom dma_interrupt_t and just use irqreturn_t
- Revision
- 5806
- Author
- vapier
- Date
- 2008-12-04 01:57:24 -0600 (Thu, 04 Dec 2008)
Log Message
drop custom dma_interrupt_t and just use irqreturn_t
Modified Paths
Diff
Modified: trunk/arch/blackfin/include/asm/dma.h (5805 => 5806)
--- trunk/arch/blackfin/include/asm/dma.h 2008-12-04 07:51:45 UTC (rev 5805)
+++ trunk/arch/blackfin/include/asm/dma.h 2008-12-04 07:57:24 UTC (rev 5806)
@@ -110,8 +110,6 @@
};
-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 dmasg *sg; /* large mode descriptor */
unsigned int ctrl_num; /* controller number */
unsigned int irq;
- dma_interrupt_t irq_callback;
+ irqreturn_t irq_callback;
void *data;
unsigned int dma_enable_flag;
unsigned int loopback_flag;
@@ -171,7 +169,7 @@
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, irqreturn_t callback,
void *data);
void dma_disable_irq(unsigned int channel);
void dma_enable_irq(unsigned int channel);
Modified: trunk/arch/blackfin/kernel/bfin_dma_5xx.c (5805 => 5806)
--- trunk/arch/blackfin/kernel/bfin_dma_5xx.c 2008-12-04 07:51:45 UTC (rev 5805)
+++ trunk/arch/blackfin/kernel/bfin_dma_5xx.c 2008-12-04 07:57:24 UTC (rev 5806)
@@ -151,7 +151,7 @@
}
EXPORT_SYMBOL(request_dma);
-int set_dma_callback(unsigned int channel, dma_interrupt_t callback, void *data)
+int set_dma_callback(unsigned int channel, irqreturn_t callback, void *data)
{
BUG_ON(!(dma_ch[channel].chan_status != DMA_CHANNEL_FREE
&& channel < MAX_DMA_CHANNELS));
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
