aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/sun3/sun3ints.c
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2011-09-11 05:28:04 -0400
committerGeert Uytterhoeven <geert@linux-m68k.org>2011-11-08 16:35:52 -0500
commitd890d73995257b4e10cdd7d55bad80e34a71ba22 (patch)
tree3e4ee85a2d8d126e1570c7ea47178a2a8a627849 /arch/m68k/sun3/sun3ints.c
parenta03010ed9b399fdbc28ac8836e0a6d4b15403f9f (diff)
m68k/irq: Remove obsolete m68k irq framework
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/sun3/sun3ints.c')
-rw-r--r--arch/m68k/sun3/sun3ints.c20
1 files changed, 0 insertions, 20 deletions
diff --git a/arch/m68k/sun3/sun3ints.c b/arch/m68k/sun3/sun3ints.c
index 626b601931e9..7eb378195cf7 100644
--- a/arch/m68k/sun3/sun3ints.c
+++ b/arch/m68k/sun3/sun3ints.c
@@ -53,9 +53,6 @@ static irqreturn_t sun3_int7(int irq, void *dev_id)
53{ 53{
54 unsigned int cnt; 54 unsigned int cnt;
55 55
56#ifndef CONFIG_GENERIC_HARDIRQS
57 *sun3_intreg |= (1 << irq);
58#endif
59 cnt = kstat_irqs_cpu(irq, 0); 56 cnt = kstat_irqs_cpu(irq, 0);
60 if (!(cnt % 2000)) 57 if (!(cnt % 2000))
61 sun3_leds(led_pattern[cnt % 16000 / 2000]); 58 sun3_leds(led_pattern[cnt % 16000 / 2000]);
@@ -69,9 +66,6 @@ static irqreturn_t sun3_int5(int irq, void *dev_id)
69#ifdef CONFIG_SUN3 66#ifdef CONFIG_SUN3
70 intersil_clear(); 67 intersil_clear();
71#endif 68#endif
72#ifndef CONFIG_GENERIC_HARDIRQS
73 *sun3_intreg |= (1 << irq);
74#endif
75#ifdef CONFIG_SUN3 69#ifdef CONFIG_SUN3
76 intersil_clear(); 70 intersil_clear();
77#endif 71#endif
@@ -89,15 +83,6 @@ static irqreturn_t sun3_vec255(int irq, void *dev_id)
89 return IRQ_HANDLED; 83 return IRQ_HANDLED;
90} 84}
91 85
92#ifndef CONFIG_GENERIC_HARDIRQS
93static void sun3_inthandle(unsigned int irq, struct pt_regs *fp)
94{
95 *sun3_intreg &= ~(1 << irq);
96
97 do_IRQ(irq, fp);
98}
99#endif
100
101static void sun3_irq_enable(struct irq_data *data) 86static void sun3_irq_enable(struct irq_data *data)
102{ 87{
103 sun3_enable_irq(data->irq); 88 sun3_enable_irq(data->irq);
@@ -114,19 +99,14 @@ static struct irq_chip sun3_irq_chip = {
114 .irq_shutdown = m68k_irq_shutdown, 99 .irq_shutdown = m68k_irq_shutdown,
115 .irq_enable = sun3_irq_enable, 100 .irq_enable = sun3_irq_enable,
116 .irq_disable = sun3_irq_disable, 101 .irq_disable = sun3_irq_disable,
117#ifdef CONFIG_GENERIC_HARDIRQS
118 .irq_mask = sun3_irq_disable, 102 .irq_mask = sun3_irq_disable,
119 .irq_unmask = sun3_irq_enable, 103 .irq_unmask = sun3_irq_enable,
120#endif
121}; 104};
122 105
123void __init sun3_init_IRQ(void) 106void __init sun3_init_IRQ(void)
124{ 107{
125 *sun3_intreg = 1; 108 *sun3_intreg = 1;
126 109
127#ifndef CONFIG_GENERIC_HARDIRQS
128 m68k_setup_auto_interrupt(sun3_inthandle);
129#endif
130 m68k_setup_irq_controller(&sun3_irq_chip, handle_level_irq, IRQ_AUTO_1, 110 m68k_setup_irq_controller(&sun3_irq_chip, handle_level_irq, IRQ_AUTO_1,
131 7); 111 7);
132 m68k_setup_user_interrupt(VEC_USER, 128, NULL); 112 m68k_setup_user_interrupt(VEC_USER, 128, NULL);