diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 13:53:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 13:59:54 -0400 |
commit | 0cd61b68c340a4f901a06e8bb5e0dea4353161c0 (patch) | |
tree | cfd72be941ecd172627a06dd61d98b55cec63a39 /arch/arm/mach-pxa/dma.c | |
parent | da104a83692cf07434ab3b20bf10093bdbc3f97e (diff) |
Initial blind fixup for arm for irq changes
Untested, but this should fix up the bulk of the totally mechanical
issues, and should make the actual detail fixing easier.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/arm/mach-pxa/dma.c')
-rw-r--r-- | arch/arm/mach-pxa/dma.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-pxa/dma.c b/arch/arm/mach-pxa/dma.c index 7d8c85486c66..4440babe7b97 100644 --- a/arch/arm/mach-pxa/dma.c +++ b/arch/arm/mach-pxa/dma.c | |||
@@ -27,13 +27,13 @@ | |||
27 | 27 | ||
28 | static struct dma_channel { | 28 | static struct dma_channel { |
29 | char *name; | 29 | char *name; |
30 | void (*irq_handler)(int, void *, struct pt_regs *); | 30 | void (*irq_handler)(int, void *); |
31 | void *data; | 31 | void *data; |
32 | } dma_channels[PXA_DMA_CHANNELS]; | 32 | } dma_channels[PXA_DMA_CHANNELS]; |
33 | 33 | ||
34 | 34 | ||
35 | int pxa_request_dma (char *name, pxa_dma_prio prio, | 35 | int pxa_request_dma (char *name, pxa_dma_prio prio, |
36 | void (*irq_handler)(int, void *, struct pt_regs *), | 36 | void (*irq_handler)(int, void *), |
37 | void *data) | 37 | void *data) |
38 | { | 38 | { |
39 | unsigned long flags; | 39 | unsigned long flags; |
@@ -87,7 +87,7 @@ void pxa_free_dma (int dma_ch) | |||
87 | local_irq_restore(flags); | 87 | local_irq_restore(flags); |
88 | } | 88 | } |
89 | 89 | ||
90 | static irqreturn_t dma_irq_handler(int irq, void *dev_id, struct pt_regs *regs) | 90 | static irqreturn_t dma_irq_handler(int irq, void *dev_id) |
91 | { | 91 | { |
92 | int i, dint = DINT; | 92 | int i, dint = DINT; |
93 | 93 | ||
@@ -95,7 +95,7 @@ static irqreturn_t dma_irq_handler(int irq, void *dev_id, struct pt_regs *regs) | |||
95 | if (dint & (1 << i)) { | 95 | if (dint & (1 << i)) { |
96 | struct dma_channel *channel = &dma_channels[i]; | 96 | struct dma_channel *channel = &dma_channels[i]; |
97 | if (channel->name && channel->irq_handler) { | 97 | if (channel->name && channel->irq_handler) { |
98 | channel->irq_handler(i, channel->data, regs); | 98 | channel->irq_handler(i, channel->data); |
99 | } else { | 99 | } else { |
100 | /* | 100 | /* |
101 | * IRQ for an unregistered DMA channel: | 101 | * IRQ for an unregistered DMA channel: |