diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2013-10-31 22:36:01 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2013-10-31 22:36:01 +0530 |
| commit | f8d9f628e1f16939ebc181a8f3f8ed31af4aee00 (patch) | |
| tree | a1d547bf427dd09a774815424a98d39dfb20ea3c | |
| parent | f0dad6e701cb66301287074c39183c7312139530 (diff) | |
| parent | db60d8da8f643586c95f8fc3e383954f8c57f1f3 (diff) | |
Merge branch 'dma_complete' into next
| -rw-r--r-- | arch/arm/common/edma.c | 4 | ||||
| -rw-r--r-- | drivers/dma/edma.c | 4 | ||||
| -rw-r--r-- | include/linux/platform_data/edma.h | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/common/edma.c b/arch/arm/common/edma.c index 8e1a0245907..41bca32409f 100644 --- a/arch/arm/common/edma.c +++ b/arch/arm/common/edma.c @@ -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); } diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c index 5dce96af9c4..183ec85cb6c 100644 --- a/drivers/dma/edma.c +++ b/drivers/dma/edma.c @@ -471,7 +471,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; @@ -490,7 +490,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); diff --git a/include/linux/platform_data/edma.h b/include/linux/platform_data/edma.h index 179fb91bb5f..f50821cb64b 100644 --- a/include/linux/platform_data/edma.h +++ b/include/linux/platform_data/edma.h @@ -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, |