ソースを参照

[ARM] dma: remove dmamode_t typedef

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Russell King 16 年 前
コミット
f0ffc81625
3 ファイル変更3 行追加8 行削除
  1. 1 6
      arch/arm/include/asm/dma.h
  2. 1 1
      arch/arm/include/asm/mach/dma.h
  3. 1 1
      arch/arm/kernel/dma.c

+ 1 - 6
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
  */

+ 1 - 1
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		*/

+ 1 - 1
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);