1 files changed, 4 insertions, 10 deletions

diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index a46676db8113..91004a3c4794 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -137,7 +137,7 @@ static void omap_disable_channel_irq(int lch);
 static inline void omap_enable_channel_irq(int lch);
 
 #define REVISIT_24XX()          printk(KERN_ERR "FIXME: no %s on 24xx\n", \
-                                                __FUNCTION__);
+                                                __func__);
 
 #ifdef CONFIG_ARCH_OMAP15XX
 /* Returns 1 if the DMA module is in OMAP1510-compatible mode, 0 otherwise */
@@ -699,7 +699,7 @@ omap_dma_set_global_params(int arb_rate, int max_fifo_depth, int tparams)
         u32 reg;
 
         if (!cpu_class_is_omap2()) {
-                printk(KERN_ERR "FIXME: no %s on 15xx/16xx\n", __FUNCTION__);
+                printk(KERN_ERR "FIXME: no %s on 15xx/16xx\n", __func__);
                 return;
         }
 
@@ -1705,14 +1705,8 @@ static int omap2_dma_handle_ch(int ch)
                 status = OMAP_DMA_CSR_REG(ch);
         }
 
-        if (likely(dma_chan[ch].callback != NULL)) {
-                if (dma_chan[ch].chain_id != -1)
-                        dma_chan[ch].callback(dma_chan[ch].chain_id, status,
-                                              dma_chan[ch].data);
-                else
-                        dma_chan[ch].callback(ch, status, dma_chan[ch].data);
-
-        }
+        if (likely(dma_chan[ch].callback != NULL))
+                dma_chan[ch].callback(ch, status, dma_chan[ch].data);
 
         OMAP_DMA_CSR_REG(ch) = status;