aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-rpc/dma.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-12-08 10:58:50 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-12-08 10:58:50 -0500
commit1df8130278c4543555fea697e5714fbac300b899 (patch)
treecf9ed1b4b76fcdaa9d61ff3dea2e9cbd6396a9e1 /arch/arm/mach-rpc/dma.c
parentf40b121d983dfc53bde882aadec7f2f0bbcbd1c2 (diff)
[ARM] dma: remove dmach_t typedef
Remove a pointless integer typedef. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-rpc/dma.c')
-rw-r--r--arch/arm/mach-rpc/dma.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/mach-rpc/dma.c b/arch/arm/mach-rpc/dma.c
index 7958a30f8932..a86d3ed859a7 100644
--- a/arch/arm/mach-rpc/dma.c
+++ b/arch/arm/mach-rpc/dma.c
@@ -125,18 +125,18 @@ static irqreturn_t iomd_dma_handle(int irq, void *dev_id)
125 return IRQ_HANDLED; 125 return IRQ_HANDLED;
126} 126}
127 127
128static int iomd_request_dma(dmach_t channel, dma_t *dma) 128static int iomd_request_dma(unsigned int chan, dma_t *dma)
129{ 129{
130 return request_irq(dma->dma_irq, iomd_dma_handle, 130 return request_irq(dma->dma_irq, iomd_dma_handle,
131 IRQF_DISABLED, dma->device_id, dma); 131 IRQF_DISABLED, dma->device_id, dma);
132} 132}
133 133
134static void iomd_free_dma(dmach_t channel, dma_t *dma) 134static void iomd_free_dma(unsigned int chan, dma_t *dma)
135{ 135{
136 free_irq(dma->dma_irq, dma); 136 free_irq(dma->dma_irq, dma);
137} 137}
138 138
139static void iomd_enable_dma(dmach_t channel, dma_t *dma) 139static void iomd_enable_dma(unsigned int chan, dma_t *dma)
140{ 140{
141 unsigned long dma_base = dma->dma_base; 141 unsigned long dma_base = dma->dma_base;
142 unsigned int ctrl = TRANSFER_SIZE | DMA_CR_E; 142 unsigned int ctrl = TRANSFER_SIZE | DMA_CR_E;
@@ -169,7 +169,7 @@ static void iomd_enable_dma(dmach_t channel, dma_t *dma)
169 enable_irq(dma->dma_irq); 169 enable_irq(dma->dma_irq);
170} 170}
171 171
172static void iomd_disable_dma(dmach_t channel, dma_t *dma) 172static void iomd_disable_dma(unsigned int chan, dma_t *dma)
173{ 173{
174 unsigned long dma_base = dma->dma_base; 174 unsigned long dma_base = dma->dma_base;
175 unsigned long flags; 175 unsigned long flags;
@@ -181,7 +181,7 @@ static void iomd_disable_dma(dmach_t channel, dma_t *dma)
181 local_irq_restore(flags); 181 local_irq_restore(flags);
182} 182}
183 183
184static int iomd_set_dma_speed(dmach_t channel, dma_t *dma, int cycle) 184static int iomd_set_dma_speed(unsigned int chan, dma_t *dma, int cycle)
185{ 185{
186 int tcr, speed; 186 int tcr, speed;
187 187
@@ -197,7 +197,7 @@ static int iomd_set_dma_speed(dmach_t channel, dma_t *dma, int cycle)
197 tcr = iomd_readb(IOMD_DMATCR); 197 tcr = iomd_readb(IOMD_DMATCR);
198 speed &= 3; 198 speed &= 3;
199 199
200 switch (channel) { 200 switch (chan) {
201 case DMA_0: 201 case DMA_0:
202 tcr = (tcr & ~0x03) | speed; 202 tcr = (tcr & ~0x03) | speed;
203 break; 203 break;
@@ -236,7 +236,7 @@ static struct fiq_handler fh = {
236 .name = "floppydma" 236 .name = "floppydma"
237}; 237};
238 238
239static void floppy_enable_dma(dmach_t channel, dma_t *dma) 239static void floppy_enable_dma(unsigned int chan, dma_t *dma)
240{ 240{
241 void *fiqhandler_start; 241 void *fiqhandler_start;
242 unsigned int fiqhandler_length; 242 unsigned int fiqhandler_length;
@@ -269,13 +269,13 @@ static void floppy_enable_dma(dmach_t channel, dma_t *dma)
269 enable_fiq(dma->dma_irq); 269 enable_fiq(dma->dma_irq);
270} 270}
271 271
272static void floppy_disable_dma(dmach_t channel, dma_t *dma) 272static void floppy_disable_dma(unsigned int chan, dma_t *dma)
273{ 273{
274 disable_fiq(dma->dma_irq); 274 disable_fiq(dma->dma_irq);
275 release_fiq(&fh); 275 release_fiq(&fh);
276} 276}
277 277
278static int floppy_get_residue(dmach_t channel, dma_t *dma) 278static int floppy_get_residue(unsigned int chan, dma_t *dma)
279{ 279{
280 struct pt_regs regs; 280 struct pt_regs regs;
281 get_fiq_regs(&regs); 281 get_fiq_regs(&regs);
@@ -292,7 +292,7 @@ static struct dma_ops floppy_dma_ops = {
292/* 292/*
293 * This is virtual DMA - we don't need anything here. 293 * This is virtual DMA - we don't need anything here.
294 */ 294 */
295static void sound_enable_disable_dma(dmach_t channel, dma_t *dma) 295static void sound_enable_disable_dma(unsigned int chan, dma_t *dma)
296{ 296{
297} 297}
298 298