[ARM] dma: remove dmamode_t typedef

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/include/asm/dma.h b/arch/arm/include/asm/dma.h
index 59f59c6c79f7b7a0e4485856f896ce2828e3424b..7edf3536df24e68a27399051046229d70c681fb2 100644 (file)
--- a/arch/arm/include/asm/dma.h
+++ b/arch/arm/include/asm/dma.h
@@ -21,11 +21,6 @@
 
 #include <mach/isa-dma.h>
 
-/*
- * DMA modes
- */
-typedef unsigned int dmamode_t;
-
 /*
  * The DMA modes reflect the settings for the ISA DMA controller
  */
@@ -125,7 +120,7 @@ extern void set_dma_count(unsigned int chan, unsigned long count);
  * DMA transfer direction immediately, but defer it to the
  * enable_dma().
  */
-extern void set_dma_mode(unsigned int chan, dmamode_t mode);
+extern void set_dma_mode(unsigned int chan, unsigned int mode);
 
 /* Set the transfer speed for this channel
  */

diff --git a/arch/arm/include/asm/mach/dma.h b/arch/arm/include/asm/mach/dma.h
index 3122adae80be01be7362eefa31f02365ac879d98..5166145d8a3c5e40db7c2d9fecb600557bb42f84 100644 (file)
--- a/arch/arm/include/asm/mach/dma.h
+++ b/arch/arm/include/asm/mach/dma.h
@@ -34,7 +34,7 @@ struct dma_struct {
        unsigned int    active:1;       /* Transfer active              */
        unsigned int    invalid:1;      /* Address/Count changed        */
 
-       dmamode_t       dma_mode;       /* DMA mode                     */
+       unsigned int    dma_mode;       /* DMA mode                     */
        int             speed;          /* DMA speed                    */
 
        unsigned int    lock;           /* Device is allocated          */

diff --git a/arch/arm/kernel/dma.c b/arch/arm/kernel/dma.c
index e7828fcd9544d4ac05eaca20af114fb990ae76a9..7d5b9fb01e71d9d5b9e8dab4e62d3302fd3fde79 100644 (file)
--- a/arch/arm/kernel/dma.c
+++ b/arch/arm/kernel/dma.c
@@ -171,7 +171,7 @@ EXPORT_SYMBOL(set_dma_count);
 
 /* Set DMA direction mode
  */
-void set_dma_mode (unsigned int chan, dmamode_t mode)
+void set_dma_mode (unsigned int chan, unsigned int mode)
 {
        dma_t *dma = dma_channel(chan);