Skip to content

Commit

Permalink
Blackfin arch: drop custom dma_interrupt_t and just use irq_handler_t
Browse files Browse the repository at this point in the history
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
  • Loading branch information
Mike Frysinger authored and Bryan Wu committed Jan 7, 2009
1 parent 259fea4 commit 68532bd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
6 changes: 2 additions & 4 deletions arch/blackfin/include/asm/dma.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/kernel/bfin_dma_5xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down

0 comments on commit 68532bd

Please sign in to comment.