From a09ba70d37e58d0dc4bfa14d4ec71238e5fa6654 Mon Sep 17 00:00:00 2001 From: Thierry Reding Date: Mon, 21 Oct 2013 17:25:16 +0200 Subject: [PATCH] ARM: davinci: Avoid name collisions Signed-off-by: Thierry Reding --- arch/arm/common/edma.c | 2 +- drivers/dma/edma.c | 4 ++-- include/linux/platform_data/edma.h | 8 ++++---- sound/soc/davinci/davinci-pcm.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/common/edma.c b/arch/arm/common/edma.c index 8e1a0245907f..185600321557 100644 --- a/arch/arm/common/edma.c +++ b/arch/arm/common/edma.c @@ -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_CC_ERROR, edma_cc[ctlr]->intr_data [k].data); } diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c index 57c3f3e53212..f5f200c2fadb 100644 --- a/drivers/dma/edma.c +++ b/drivers/dma/edma.c @@ -468,7 +468,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_COMPLETE: spin_lock_irqsave(&echan->vchan.lock, flags); edesc = echan->edesc; @@ -487,7 +487,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_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 179fb91bb5f2..e6877308d63a 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_COMPLETE 1 +#define EDMA_CC_ERROR 2 +#define EDMA_TC1_ERROR 3 +#define EDMA_TC2_ERROR 4 enum address_mode { INCR = 0, diff --git a/sound/soc/davinci/davinci-pcm.c b/sound/soc/davinci/davinci-pcm.c index 84a63c660ab9..a16df812496a 100644 --- a/sound/soc/davinci/davinci-pcm.c +++ b/sound/soc/davinci/davinci-pcm.c @@ -238,7 +238,7 @@ static void davinci_pcm_dma_irq(unsigned link, u16 ch_status, void *data) print_buf_info(prtd->ram_channel, "i ram_channel"); pr_debug("davinci_pcm: link=%d, status=0x%x\n", link, ch_status); - if (unlikely(ch_status != DMA_COMPLETE)) + if (unlikely(ch_status != EDMA_COMPLETE)) return; if (snd_pcm_running(substream)) { -- 2.39.2