aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/q40
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2011-04-13 16:31:28 -0400
committerGeert Uytterhoeven <geert@linux-m68k.org>2011-11-08 16:35:47 -0500
commitc288bf2533e57174b90b07860c4391bcd1ea269c (patch)
tree91fa6ef91d6653f491f41ff97c4da5e28dfd62fe /arch/m68k/q40
parent3ec7215e5d1a714ef65069a1d0999a31e4930bb7 (diff)
m68k/irq: Rename irq_controller to irq_chip
Make it more similar to the genirq version: - Remove lock (unused as we don't do SMP anyway), - Prepend methods with irq_, - Make irq_startup() return unsigned int. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/m68k/q40')
-rw-r--r--arch/m68k/q40/q40ints.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/arch/m68k/q40/q40ints.c b/arch/m68k/q40/q40ints.c
index 9f0e3d59bf92..fa05a03f8dfe 100644
--- a/arch/m68k/q40/q40ints.c
+++ b/arch/m68k/q40/q40ints.c
@@ -41,14 +41,14 @@ static void q40_disable_irq(unsigned int);
41unsigned short q40_ablecount[35]; 41unsigned short q40_ablecount[35];
42unsigned short q40_state[35]; 42unsigned short q40_state[35];
43 43
44static int q40_irq_startup(unsigned int irq) 44static unsigned int q40_irq_startup(unsigned int irq)
45{ 45{
46 /* test for ISA ints not implemented by HW */ 46 /* test for ISA ints not implemented by HW */
47 switch (irq) { 47 switch (irq) {
48 case 1: case 2: case 8: case 9: 48 case 1: case 2: case 8: case 9:
49 case 11: case 12: case 13: 49 case 11: case 12: case 13:
50 printk("%s: ISA IRQ %d not implemented by HW\n", __func__, irq); 50 printk("%s: ISA IRQ %d not implemented by HW\n", __func__, irq);
51 return -ENXIO; 51 /* FIXME return -ENXIO; */
52 } 52 }
53 return 0; 53 return 0;
54} 54}
@@ -57,13 +57,12 @@ static void q40_irq_shutdown(unsigned int irq)
57{ 57{
58} 58}
59 59
60static struct irq_controller q40_irq_controller = { 60static struct irq_chip q40_irq_chip = {
61 .name = "q40", 61 .name = "q40",
62 .lock = __SPIN_LOCK_UNLOCKED(q40_irq_controller.lock), 62 .irq_startup = q40_irq_startup,
63 .startup = q40_irq_startup, 63 .irq_shutdown = q40_irq_shutdown,
64 .shutdown = q40_irq_shutdown, 64 .irq_enable = q40_enable_irq,
65 .enable = q40_enable_irq, 65 .irq_disable = q40_disable_irq,
66 .disable = q40_disable_irq,
67}; 66};
68 67
69/* 68/*
@@ -81,7 +80,7 @@ static int disabled;
81 80
82void __init q40_init_IRQ(void) 81void __init q40_init_IRQ(void)
83{ 82{
84 m68k_setup_irq_controller(&q40_irq_controller, 1, Q40_IRQ_MAX); 83 m68k_setup_irq_chip(&q40_irq_chip, 1, Q40_IRQ_MAX);
85 84
86 /* setup handler for ISA ints */ 85 /* setup handler for ISA ints */
87 m68k_setup_auto_interrupt(q40_irq_handler); 86 m68k_setup_auto_interrupt(q40_irq_handler);