diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-07-01 14:39:19 -0400 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-11-08 16:35:48 -0500 |
commit | 1425df87c25b15400c9f26d57821bcfe01286b2a (patch) | |
tree | 845f69013de5ebb1b9ebfe4746c096664a505567 /arch/m68k/mac/via.c | |
parent | edb347256c44366888debb4f9e8477ac700a9026 (diff) |
m68k/irq: Rename {,__}m68k_handle_int()
- Rename m68k_handle_int() to generic_handle_irq(), and drop the unneeded
asmlinkage,
- Rename __m68k_handle_int() to do_IRQ().
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/mac/via.c')
-rw-r--r-- | arch/m68k/mac/via.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/m68k/mac/via.c b/arch/m68k/mac/via.c index e71166daec6a..067857046137 100644 --- a/arch/m68k/mac/via.c +++ b/arch/m68k/mac/via.c | |||
@@ -460,7 +460,7 @@ irqreturn_t via1_irq(int irq, void *dev_id) | |||
460 | do { | 460 | do { |
461 | if (events & irq_bit) { | 461 | if (events & irq_bit) { |
462 | via1[vIFR] = irq_bit; | 462 | via1[vIFR] = irq_bit; |
463 | m68k_handle_int(irq_num); | 463 | generic_handle_irq(irq_num); |
464 | } | 464 | } |
465 | ++irq_num; | 465 | ++irq_num; |
466 | irq_bit <<= 1; | 466 | irq_bit <<= 1; |
@@ -482,7 +482,7 @@ irqreturn_t via2_irq(int irq, void *dev_id) | |||
482 | do { | 482 | do { |
483 | if (events & irq_bit) { | 483 | if (events & irq_bit) { |
484 | via2[gIFR] = irq_bit | rbv_clear; | 484 | via2[gIFR] = irq_bit | rbv_clear; |
485 | m68k_handle_int(irq_num); | 485 | generic_handle_irq(irq_num); |
486 | } | 486 | } |
487 | ++irq_num; | 487 | ++irq_num; |
488 | irq_bit <<= 1; | 488 | irq_bit <<= 1; |
@@ -514,7 +514,7 @@ irqreturn_t via_nubus_irq(int irq, void *dev_id) | |||
514 | do { | 514 | do { |
515 | if (events & slot_bit) { | 515 | if (events & slot_bit) { |
516 | events &= ~slot_bit; | 516 | events &= ~slot_bit; |
517 | m68k_handle_int(slot_irq); | 517 | generic_handle_irq(slot_irq); |
518 | } | 518 | } |
519 | --slot_irq; | 519 | --slot_irq; |
520 | slot_bit >>= 1; | 520 | slot_bit >>= 1; |