ARM: OMAP: Remove broken DMA function omap_get_dma_src_addr_counter

[pandora-kernel.git] / arch / arm / plat-omap / dma.c

diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index a90b0f7..1bb6a56 100644 (file)
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -143,7 +143,7 @@ static inline void omap_enable_channel_irq(int lch);
 #define REVISIT_24XX()         printk(KERN_ERR "FIXME: no %s on 24xx\n", \
                                                __func__);
 
-#define dma_read(reg)                                          \
+#define dma_read(reg)                                                  \
 ({                                                                     \
        u32 __val;                                                      \
        if (cpu_class_is_omap1())                                       \
@@ -156,7 +156,7 @@ static inline void omap_enable_channel_irq(int lch);
 #define dma_write(val, reg)                                            \
 ({                                                                     \
        if (cpu_class_is_omap1())                                       \
-               __raw_writew((u16)val, omap_dma_base + OMAP1_DMA_##reg);\
+               __raw_writew((u16)(val), omap_dma_base + OMAP1_DMA_##reg); \
        else                                                            \
                __raw_writel((val), omap_dma_base + OMAP_DMA4_##reg);   \
 })
@@ -1010,20 +1010,17 @@ dma_addr_t omap_get_dma_src_pos(int lch)
 {
        dma_addr_t offset = 0;
 
-       if (cpu_class_is_omap1())
-               offset = (dma_addr_t)(dma_read(CSSA_L(lch)) |
-                                       (dma_read(CSSA_U(lch)) << 16));
+       offset = dma_read(CSAC(lch));
 
-       if (cpu_class_is_omap2()) {
+       /*
+        * omap 3.2/3.3 erratum: sometimes 0 is returned if CSAC/CDAC is
+        * read before the DMA controller finished disabling the channel.
+        */
+       if (offset == 0)
                offset = dma_read(CSAC(lch));
 
-               /*
-                * omap 3.2/3.3 erratum: sometimes 0 is returned if CSAC/CDAC is
-                * read before the DMA controller finished disabling the channel.
-                */
-               if (offset == 0)
-                       offset = dma_read(CSAC(lch));
-       }
+       if (cpu_class_is_omap1())
+               offset |= (dma_read(CSSA_U(lch)) << 16);
 
        return offset;
 }
@@ -1041,36 +1038,22 @@ dma_addr_t omap_get_dma_dst_pos(int lch)
 {
        dma_addr_t offset = 0;
 
-       if (cpu_class_is_omap1())
-               offset = (dma_addr_t)(dma_read(CDSA_L(lch)) |
-                                       (dma_read(CDSA_U(lch)) << 16));
+       offset = dma_read(CDAC(lch));
 
-       if (cpu_class_is_omap2()) {
+       /*
+        * omap 3.2/3.3 erratum: sometimes 0 is returned if CSAC/CDAC is
+        * read before the DMA controller finished disabling the channel.
+        */
+       if (offset == 0)
                offset = dma_read(CDAC(lch));
 
-               /*
-                * omap 3.2/3.3 erratum: sometimes 0 is returned if CSAC/CDAC is
-                * read before the DMA controller finished disabling the channel.
-                */
-               if (offset == 0)
-                       offset = dma_read(CDAC(lch));
-       }
+       if (cpu_class_is_omap1())
+               offset |= (dma_read(CDSA_U(lch)) << 16);
 
        return offset;
 }
 EXPORT_SYMBOL(omap_get_dma_dst_pos);
 
-/*
- * Returns current source transfer counting for the given DMA channel.
- * Can be used to monitor the progress of a transfer inside a block.
- * It must be called with disabled interrupts.
- */
-int omap_get_dma_src_addr_counter(int lch)
-{
-       return (dma_addr_t)dma_read(CSAC(lch));
-}
-EXPORT_SYMBOL(omap_get_dma_src_addr_counter);
-
 int omap_get_dma_active_status(int lch)
 {
        return (dma_read(CCR(lch)) & OMAP_DMA_CCR_EN) != 0;