diff options
author | Mike Frysinger <vapier.adi@gmail.com> | 2009-01-07 10:14:38 -0500 |
---|---|---|
committer | Bryan Wu <cooloney@kernel.org> | 2009-01-07 10:14:38 -0500 |
commit | 68532bdac35c9cc467c14cb9ea675835e07b5619 (patch) | |
tree | 0a1e85c021568a8655fa14e1869f2e8ec9cf6cbc /arch/blackfin/include/asm/dma.h | |
parent | 259fea42e66e62226c310a6646049b99912af7cc (diff) |
Blackfin arch: drop custom dma_interrupt_t and just use irq_handler_t
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch/blackfin/include/asm/dma.h')
-rw-r--r-- | arch/blackfin/include/asm/dma.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/blackfin/include/asm/dma.h b/arch/blackfin/include/asm/dma.h index ca8252ab7a10..045bd1ce72bf 100644 --- a/arch/blackfin/include/asm/dma.h +++ b/arch/blackfin/include/asm/dma.h | |||
@@ -110,8 +110,6 @@ struct dma_register { | |||
110 | 110 | ||
111 | }; | 111 | }; |
112 | 112 | ||
113 | typedef irqreturn_t(*dma_interrupt_t) (int irq, void *dev_id); | ||
114 | |||
115 | struct dma_channel { | 113 | struct dma_channel { |
116 | struct mutex dmalock; | 114 | struct mutex dmalock; |
117 | const char *device_id; | 115 | const char *device_id; |
@@ -120,7 +118,7 @@ struct dma_channel { | |||
120 | struct dmasg *sg; /* large mode descriptor */ | 118 | struct dmasg *sg; /* large mode descriptor */ |
121 | unsigned int ctrl_num; /* controller number */ | 119 | unsigned int ctrl_num; /* controller number */ |
122 | unsigned int irq; | 120 | unsigned int irq; |
123 | dma_interrupt_t irq_callback; | 121 | irq_handler_t irq_callback; |
124 | void *data; | 122 | void *data; |
125 | unsigned int dma_enable_flag; | 123 | unsigned int dma_enable_flag; |
126 | unsigned int loopback_flag; | 124 | unsigned int loopback_flag; |
@@ -171,7 +169,7 @@ int dma_channel_active(unsigned int channel); /* check if a channel is in use */ | |||
171 | void disable_dma(unsigned int channel); | 169 | void disable_dma(unsigned int channel); |
172 | void enable_dma(unsigned int channel); | 170 | void enable_dma(unsigned int channel); |
173 | int request_dma(unsigned int channel, const char *device_id); | 171 | int request_dma(unsigned int channel, const char *device_id); |
174 | int set_dma_callback(unsigned int channel, dma_interrupt_t callback, | 172 | int set_dma_callback(unsigned int channel, irq_handler_t callback, |
175 | void *data); | 173 | void *data); |
176 | void dma_disable_irq(unsigned int channel); | 174 | void dma_disable_irq(unsigned int channel); |
177 | void dma_enable_irq(unsigned int channel); | 175 | void dma_enable_irq(unsigned int channel); |