dmanengine: fix edma driver to not define DMA_COMPLETE
edma header defines DMA_COMPLETE, this causes issues as commit adfedd9a32
move
DMA_SUCCESS to DMA_COMPLETE. edma should properly namespace its defines and
needs a future fix
Reported-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
This commit is contained in:
parent
7db5f7274a
commit
db60d8da8f
|
@ -404,7 +404,7 @@ static irqreturn_t dma_irq_handler(int irq, void *data)
|
|||
BIT(slot));
|
||||
if (edma_cc[ctlr]->intr_data[channel].callback)
|
||||
edma_cc[ctlr]->intr_data[channel].callback(
|
||||
channel, DMA_COMPLETE,
|
||||
channel, EDMA_DMA_COMPLETE,
|
||||
edma_cc[ctlr]->intr_data[channel].data);
|
||||
}
|
||||
} while (sh_ipr);
|
||||
|
@ -459,7 +459,7 @@ static irqreturn_t dma_ccerr_handler(int irq, void *data)
|
|||
callback) {
|
||||
edma_cc[ctlr]->intr_data[k].
|
||||
callback(k,
|
||||
DMA_CC_ERROR,
|
||||
EDMA_DMA_CC_ERROR,
|
||||
edma_cc[ctlr]->intr_data
|
||||
[k].data);
|
||||
}
|
||||
|
|
|
@ -407,7 +407,7 @@ static void edma_callback(unsigned ch_num, u16 ch_status, void *data)
|
|||
edma_pause(echan->ch_num);
|
||||
|
||||
switch (ch_status) {
|
||||
case DMA_COMPLETE:
|
||||
case EDMA_DMA_COMPLETE:
|
||||
spin_lock_irqsave(&echan->vchan.lock, flags);
|
||||
|
||||
edesc = echan->edesc;
|
||||
|
@ -426,7 +426,7 @@ static void edma_callback(unsigned ch_num, u16 ch_status, void *data)
|
|||
spin_unlock_irqrestore(&echan->vchan.lock, flags);
|
||||
|
||||
break;
|
||||
case DMA_CC_ERROR:
|
||||
case EDMA_DMA_CC_ERROR:
|
||||
spin_lock_irqsave(&echan->vchan.lock, flags);
|
||||
|
||||
edma_read_slot(EDMA_CHAN_SLOT(echan->slot[0]), &p);
|
||||
|
|
|
@ -67,10 +67,10 @@ struct edmacc_param {
|
|||
#define ITCCHEN BIT(23)
|
||||
|
||||
/*ch_status paramater of callback function possible values*/
|
||||
#define DMA_COMPLETE 1
|
||||
#define DMA_CC_ERROR 2
|
||||
#define DMA_TC1_ERROR 3
|
||||
#define DMA_TC2_ERROR 4
|
||||
#define EDMA_DMA_COMPLETE 1
|
||||
#define EDMA_DMA_CC_ERROR 2
|
||||
#define EDMA_DMA_TC1_ERROR 3
|
||||
#define EDMA_DMA_TC2_ERROR 4
|
||||
|
||||
enum address_mode {
|
||||
INCR = 0,
|
||||
|
|
Loading…
Reference in a new issue