diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-01-02 07:34:31 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-01-02 07:34:31 -0500 |
commit | 4e57ea9a2e8e807e20f64d5b53fbee2c7c9e87ae (patch) | |
tree | 41c1c67eb8a36b7b27e0b9cb4a8a537cb18da2ee | |
parent | bc6447b8e4fdb3306ee6381df9650a1a8aa57c5b (diff) |
[ARM] dma: remove usage of dmamode_t from MXC platform support
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | arch/arm/plat-mxc/dma-mx1-mx2.c | 6 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/dma-mx1-mx2.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/plat-mxc/dma-mx1-mx2.c b/arch/arm/plat-mxc/dma-mx1-mx2.c index 214274344442..92bc4f6bd019 100644 --- a/arch/arm/plat-mxc/dma-mx1-mx2.c +++ b/arch/arm/plat-mxc/dma-mx1-mx2.c | |||
@@ -114,7 +114,7 @@ struct imx_dma_channel { | |||
114 | void (*err_handler) (int, void *, int errcode); | 114 | void (*err_handler) (int, void *, int errcode); |
115 | void (*prog_handler) (int, void *, struct scatterlist *); | 115 | void (*prog_handler) (int, void *, struct scatterlist *); |
116 | void *data; | 116 | void *data; |
117 | dmamode_t dma_mode; | 117 | unsigned int dma_mode; |
118 | struct scatterlist *sg; | 118 | struct scatterlist *sg; |
119 | unsigned int resbytes; | 119 | unsigned int resbytes; |
120 | int dma_num; | 120 | int dma_num; |
@@ -193,7 +193,7 @@ static inline int imx_dma_sg_next(int channel, struct scatterlist *sg) | |||
193 | int | 193 | int |
194 | imx_dma_setup_single(int channel, dma_addr_t dma_address, | 194 | imx_dma_setup_single(int channel, dma_addr_t dma_address, |
195 | unsigned int dma_length, unsigned int dev_addr, | 195 | unsigned int dma_length, unsigned int dev_addr, |
196 | dmamode_t dmamode) | 196 | unsigned int dmamode) |
197 | { | 197 | { |
198 | struct imx_dma_channel *imxdma = &imx_dma_channels[channel]; | 198 | struct imx_dma_channel *imxdma = &imx_dma_channels[channel]; |
199 | 199 | ||
@@ -288,7 +288,7 @@ int | |||
288 | imx_dma_setup_sg(int channel, | 288 | imx_dma_setup_sg(int channel, |
289 | struct scatterlist *sg, unsigned int sgcount, | 289 | struct scatterlist *sg, unsigned int sgcount, |
290 | unsigned int dma_length, unsigned int dev_addr, | 290 | unsigned int dma_length, unsigned int dev_addr, |
291 | dmamode_t dmamode) | 291 | unsigned int dmamode) |
292 | { | 292 | { |
293 | struct imx_dma_channel *imxdma = &imx_dma_channels[channel]; | 293 | struct imx_dma_channel *imxdma = &imx_dma_channels[channel]; |
294 | 294 | ||
diff --git a/arch/arm/plat-mxc/include/mach/dma-mx1-mx2.h b/arch/arm/plat-mxc/include/mach/dma-mx1-mx2.h index 6cc6f0c8cb25..c162920b13a9 100644 --- a/arch/arm/plat-mxc/include/mach/dma-mx1-mx2.h +++ b/arch/arm/plat-mxc/include/mach/dma-mx1-mx2.h | |||
@@ -54,12 +54,12 @@ imx_dma_config_burstlen(int channel, unsigned int burstlen); | |||
54 | int | 54 | int |
55 | imx_dma_setup_single(int channel, dma_addr_t dma_address, | 55 | imx_dma_setup_single(int channel, dma_addr_t dma_address, |
56 | unsigned int dma_length, unsigned int dev_addr, | 56 | unsigned int dma_length, unsigned int dev_addr, |
57 | dmamode_t dmamode); | 57 | unsigned int dmamode); |
58 | 58 | ||
59 | int | 59 | int |
60 | imx_dma_setup_sg(int channel, struct scatterlist *sg, | 60 | imx_dma_setup_sg(int channel, struct scatterlist *sg, |
61 | unsigned int sgcount, unsigned int dma_length, | 61 | unsigned int sgcount, unsigned int dma_length, |
62 | unsigned int dev_addr, dmamode_t dmamode); | 62 | unsigned int dev_addr, unsigned int dmamode); |
63 | 63 | ||
64 | int | 64 | int |
65 | imx_dma_setup_handlers(int channel, | 65 | imx_dma_setup_handlers(int channel, |