Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0ffc816 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] dma: remove dmamode_t typedef 



Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 4e57ea9a

arch/arm/include/asm/dma.h

+1 −6
Original line number Diff line number Diff line
@@ -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

 */

arch/arm/include/asm/mach/dma.h

+1 −1
Original line number Diff line number Diff line
@@ -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		*/

arch/arm/kernel/dma.c

+1 −1
Original line number Diff line number Diff line
@@ -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);