From: Mike Frysinger Date: Wed, 7 Jan 2009 15:14:38 +0000 (+0800) Subject: Blackfin arch: drop irq_callback from struct dma_channel X-Git-Tag: v2.6.29-rc1~189^2~56 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=9b011407d653b92191aa4993222523039d44af52;p=linux-2.6-omap-h63xx.git Blackfin arch: drop irq_callback from struct dma_channel the irq member already serves the same purpose Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu --- diff --git a/arch/blackfin/include/asm/dma.h b/arch/blackfin/include/asm/dma.h index 045bd1ce72b..c327135ff9d 100644 --- a/arch/blackfin/include/asm/dma.h +++ b/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/arch/blackfin/kernel/bfin_dma_5xx.c b/arch/blackfin/kernel/bfin_dma_5xx.c index b6cf643f593..bdebab41419 100644 --- a/arch/blackfin/kernel/bfin_dma_5xx.c +++ b/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 */