summaryrefslogtreecommitdiffstats
path: root/arch/m68k/sun3
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2011-09-11 11:28:04 +0200
committerGeert Uytterhoeven <geert@linux-m68k.org>2011-11-08 22:35:52 +0100
commitd890d73995257b4e10cdd7d55bad80e34a71ba22 (patch)
tree3e4ee85a2d8d126e1570c7ea47178a2a8a627849 /arch/m68k/sun3
parenta03010ed9b399fdbc28ac8836e0a6d4b15403f9f (diff)
downloadlinux-d890d73995257b4e10cdd7d55bad80e34a71ba22.tar.gz
linux-d890d73995257b4e10cdd7d55bad80e34a71ba22.tar.bz2
linux-d890d73995257b4e10cdd7d55bad80e34a71ba22.zip
m68k/irq: Remove obsolete m68k irq framework
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/sun3')
-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)
{
unsigned int cnt;
-#ifndef CONFIG_GENERIC_HARDIRQS
- *sun3_intreg |= (1 << irq);
-#endif
cnt = kstat_irqs_cpu(irq, 0);
if (!(cnt % 2000))
sun3_leds(led_pattern[cnt % 16000 / 2000]);
@@ -69,9 +66,6 @@ static irqreturn_t sun3_int5(int irq, void *dev_id)
#ifdef CONFIG_SUN3
intersil_clear();
#endif
-#ifndef CONFIG_GENERIC_HARDIRQS
- *sun3_intreg |= (1 << irq);
-#endif
#ifdef CONFIG_SUN3
intersil_clear();
#endif
@@ -89,15 +83,6 @@ static irqreturn_t sun3_vec255(int irq, void *dev_id)
return IRQ_HANDLED;
}
-#ifndef CONFIG_GENERIC_HARDIRQS
-static void sun3_inthandle(unsigned int irq, struct pt_regs *fp)
-{
- *sun3_intreg &= ~(1 << irq);
-
- do_IRQ(irq, fp);
-}
-#endif
-
static void sun3_irq_enable(struct irq_data *data)
{
sun3_enable_irq(data->irq);
@@ -114,19 +99,14 @@ static struct irq_chip sun3_irq_chip = {
.irq_shutdown = m68k_irq_shutdown,
.irq_enable = sun3_irq_enable,
.irq_disable = sun3_irq_disable,
-#ifdef CONFIG_GENERIC_HARDIRQS
.irq_mask = sun3_irq_disable,
.irq_unmask = sun3_irq_enable,
-#endif
};
void __init sun3_init_IRQ(void)
{
*sun3_intreg = 1;
-#ifndef CONFIG_GENERIC_HARDIRQS
- m68k_setup_auto_interrupt(sun3_inthandle);
-#endif
m68k_setup_irq_controller(&sun3_irq_chip, handle_level_irq, IRQ_AUTO_1,
7);
m68k_setup_user_interrupt(VEC_USER, 128, NULL);