ARM: davinci: Avoid name collisions

Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm/common/edma.c b/arch/arm/common/edma.c
index 8e1a0245907f85be1a460bfa785f744daf285d6f..1856003215573632d2f868a7bdc4bb414fd8b383 100644 (file)
--- 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 57c3f3e5321257a11e26b9e2277213b3c65f64a2..f5f200c2fadb4ba7080c8ae434c04fe18a4169ee 100644 (file)
--- 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 179fb91bb5f2eaef7354e37411628f90a6c02335..e6877308d63aac88e0d0917c89dcd6f73c4dcc89 100644 (file)
--- 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 84a63c660ab93b48f090e4085048cc0959cc6aa2..a16df812496a7fb835db9688c7b8487fe5dfd22a 100644 (file)
--- 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)) {