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/plat-omap/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/plat-omap/dma.c')
-rw-r--r-- | arch/arm/plat-omap/dma.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index 1bbb431843ce..bb045e5ddbd8 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c | |||
@@ -899,8 +899,7 @@ static int omap1_dma_handle_ch(int ch) | |||
899 | return 1; | 899 | return 1; |
900 | } | 900 | } |
901 | 901 | ||
902 | static irqreturn_t omap1_dma_irq_handler(int irq, void *dev_id, | 902 | static irqreturn_t omap1_dma_irq_handler(int irq, void *dev_id) |
903 | struct pt_regs *regs) | ||
904 | { | 903 | { |
905 | int ch = ((int) dev_id) - 1; | 904 | int ch = ((int) dev_id) - 1; |
906 | int handled = 0; | 905 | int handled = 0; |
@@ -962,8 +961,7 @@ static int omap2_dma_handle_ch(int ch) | |||
962 | } | 961 | } |
963 | 962 | ||
964 | /* STATUS register count is from 1-32 while our is 0-31 */ | 963 | /* STATUS register count is from 1-32 while our is 0-31 */ |
965 | static irqreturn_t omap2_dma_irq_handler(int irq, void *dev_id, | 964 | static irqreturn_t omap2_dma_irq_handler(int irq, void *dev_id) |
966 | struct pt_regs *regs) | ||
967 | { | 965 | { |
968 | u32 val; | 966 | u32 val; |
969 | int i; | 967 | int i; |
@@ -1220,8 +1218,7 @@ static void set_b1_regs(void) | |||
1220 | omap_writew(fi, OMAP1610_DMA_LCD_SRC_FI_B1_L); | 1218 | omap_writew(fi, OMAP1610_DMA_LCD_SRC_FI_B1_L); |
1221 | } | 1219 | } |
1222 | 1220 | ||
1223 | static irqreturn_t lcd_dma_irq_handler(int irq, void *dev_id, | 1221 | static irqreturn_t lcd_dma_irq_handler(int irq, void *dev_id) |
1224 | struct pt_regs *regs) | ||
1225 | { | 1222 | { |
1226 | u16 w; | 1223 | u16 w; |
1227 | 1224 | ||