提交 9b011407 编写于 作者: M Mike Frysinger 提交者: Bryan Wu

Blackfin arch: drop irq_callback from struct dma_channel

the irq member already serves the same purpose
Signed-off-by: NMike Frysinger <vapier.adi@gmail.com>
Signed-off-by: NBryan Wu <cooloney@kernel.org>
上级 68532bda
...@@ -118,7 +118,6 @@ struct dma_channel { ...@@ -118,7 +118,6 @@ struct dma_channel {
struct dmasg *sg; /* large mode descriptor */ struct dmasg *sg; /* large mode descriptor */
unsigned int ctrl_num; /* controller number */ unsigned int ctrl_num; /* controller number */
unsigned int irq; unsigned int irq;
irq_handler_t irq_callback;
void *data; void *data;
unsigned int dma_enable_flag; unsigned int dma_enable_flag;
unsigned int loopback_flag; unsigned int loopback_flag;
......
...@@ -140,7 +140,7 @@ int request_dma(unsigned int channel, const char *device_id) ...@@ -140,7 +140,7 @@ int request_dma(unsigned int channel, const char *device_id)
#endif #endif
dma_ch[channel].device_id = device_id; 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 - /* This is to be enabled by putting a restriction -
* you have to request DMA, before doing any operations on * 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) ...@@ -169,7 +169,6 @@ int set_dma_callback(unsigned int channel, irq_handler_t callback, void *data)
"Request irq in DMA engine failed.\n"); "Request irq in DMA engine failed.\n");
return -EPERM; return -EPERM;
} }
dma_ch[channel].irq_callback = callback;
} }
return 0; return 0;
} }
...@@ -185,7 +184,7 @@ void free_dma(unsigned int channel) ...@@ -185,7 +184,7 @@ void free_dma(unsigned int channel)
disable_dma(channel); disable_dma(channel);
clear_dma_buffer(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); free_irq(dma_ch[channel].irq, dma_ch[channel].data);
/* Clear the DMA Variable in the Channel */ /* Clear the DMA Variable in the Channel */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册