aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/atari
diff options
context:
space:
mode:
authorRoman Zippel <zippel@linux-m68k.org>2006-06-25 08:46:58 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-25 13:00:56 -0400
commit92445eaaadc1f03f5a177ecc957bda76bf2ba8d5 (patch)
treee327dc2b95b3fe34183428314d6b6e0700e9e72b /arch/m68k/atari
parentf2325ecebc5b7988fd49968bd3a660fd1594dc84 (diff)
[PATCH] m68k: separate handler for auto and user vector interrupt
Use separate entry points for auto and user vector interrupts and cleanup naming a little. Signed-off-by: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/m68k/atari')
-rw-r--r--arch/m68k/atari/ataints.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/m68k/atari/ataints.c b/arch/m68k/atari/ataints.c
index 076f47917842..bb54741dd6cd 100644
--- a/arch/m68k/atari/ataints.c
+++ b/arch/m68k/atari/ataints.c
@@ -314,7 +314,7 @@ __ALIGN_STR "\n\t"
314 "rte"); 314 "rte");
315 315
316/* Defined in entry.S; only increments 'num_spurious' */ 316/* Defined in entry.S; only increments 'num_spurious' */
317asmlinkage void bad_interrupt(void); 317asmlinkage void bad_inthandler(void);
318 318
319extern void atari_microwire_cmd( int cmd ); 319extern void atari_microwire_cmd( int cmd );
320 320
@@ -337,7 +337,7 @@ void __init atari_init_IRQ(void)
337 337
338 /* initialize the vector table */ 338 /* initialize the vector table */
339 for (i = 0; i < NUM_INT_SOURCES; ++i) { 339 for (i = 0; i < NUM_INT_SOURCES; ++i) {
340 vectors[IRQ_SOURCE_TO_VECTOR(i)] = bad_interrupt; 340 vectors[IRQ_SOURCE_TO_VECTOR(i)] = bad_inthandler;
341 } 341 }
342 342
343 /* Initialize the MFP(s) */ 343 /* Initialize the MFP(s) */
@@ -461,7 +461,7 @@ int atari_request_irq(unsigned int irq, irqreturn_t (*handler)(int, void *, stru
461 return -EINVAL; 461 return -EINVAL;
462 } 462 }
463 463
464 if (vectors[vector] == bad_interrupt) { 464 if (vectors[vector] == bad_inthandler) {
465 /* int has no handler yet */ 465 /* int has no handler yet */
466 irq_handler[irq].handler = handler; 466 irq_handler[irq].handler = handler;
467 irq_handler[irq].dev_id = dev_id; 467 irq_handler[irq].dev_id = dev_id;
@@ -528,7 +528,7 @@ void atari_free_irq(unsigned int irq, void *dev_id)
528 } 528 }
529 529
530 vector = IRQ_SOURCE_TO_VECTOR(irq); 530 vector = IRQ_SOURCE_TO_VECTOR(irq);
531 if (vectors[vector] == bad_interrupt) 531 if (vectors[vector] == bad_inthandler)
532 goto not_found; 532 goto not_found;
533 533
534 local_irq_save(flags); 534 local_irq_save(flags);
@@ -542,7 +542,7 @@ void atari_free_irq(unsigned int irq, void *dev_id)
542 irq_handler[irq].handler = NULL; 542 irq_handler[irq].handler = NULL;
543 irq_handler[irq].dev_id = NULL; 543 irq_handler[irq].dev_id = NULL;
544 irq_param[irq].devname = NULL; 544 irq_param[irq].devname = NULL;
545 vectors[vector] = bad_interrupt; 545 vectors[vector] = bad_inthandler;
546 /* If MFP int, also disable it */ 546 /* If MFP int, also disable it */
547 atari_disable_irq(irq); 547 atari_disable_irq(irq);
548 atari_turnoff_irq(irq); 548 atari_turnoff_irq(irq);
@@ -617,7 +617,7 @@ int show_atari_interrupts(struct seq_file *p, void *v)
617 int i; 617 int i;
618 618
619 for (i = 0; i < NUM_INT_SOURCES; ++i) { 619 for (i = 0; i < NUM_INT_SOURCES; ++i) {
620 if (vectors[IRQ_SOURCE_TO_VECTOR(i)] == bad_interrupt) 620 if (vectors[IRQ_SOURCE_TO_VECTOR(i)] == bad_inthandler)
621 continue; 621 continue;
622 if (i < STMFP_SOURCE_BASE) 622 if (i < STMFP_SOURCE_BASE)
623 seq_printf(p, "auto %2d: %10u ", 623 seq_printf(p, "auto %2d: %10u ",