m68k/q40: Convert Q40/Q60 to genirq
authorGeert Uytterhoeven <geert@linux-m68k.org>
Thu, 18 Aug 2011 12:47:16 +0000 (14:47 +0200)
committerGeert Uytterhoeven <geert@linux-m68k.org>
Tue, 8 Nov 2011 21:35:52 +0000 (22:35 +0100)
q40_irq_handler() must be kept to translate ISA IRQs to the range 1-15.
q40_probe_irq_o{ff,n}() become unused.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Richard Zidlicky <rz@linux-m68k.org>
arch/m68k/Kconfig
arch/m68k/include/asm/q40ints.h
arch/m68k/q40/q40ints.c

index 290f9c838b35876526b63b107a5c75ef389c4f4c..06198ced2245315a2456a16be3548e4098eb501c 100644 (file)
@@ -87,7 +87,6 @@ config MMU_SUN3
 config USE_GENERIC_HARDIRQS
        bool "Use genirq"
        depends on MMU
-       depends on !Q40
        select HAVE_GENERIC_HARDIRQS
        select GENERIC_IRQ_SHOW
 
index 3d970afb708fc5bd19937cef0afefea56e8279db..01cdbb4da4654eaaf07a620f3ac408bdb74fc11f 100644 (file)
@@ -25,5 +25,7 @@
 #define Q40_IRQ14_MASK       (1<<6)
 #define Q40_IRQ15_MASK       (1<<7)
 
+#ifndef CONFIG_GENERIC_HARDIRQS
 extern unsigned long q40_probe_irq_on (void);
 extern int q40_probe_irq_off (unsigned long irqs);
+#endif
index afe600c0365986d584ceb1026e658b08b01a094f..f1e5288f043fb4fd394a16daeebf509afeb23b27 100644 (file)
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/interrupt.h>
+#ifdef CONFIG_GENERIC_HARDIRQS
+#include <linux/irq.h>
+#else
+#include <asm/irq.h>
+#endif
 
 #include <asm/ptrace.h>
 #include <asm/system.h>
-#include <asm/irq.h>
 #include <asm/traps.h>
 
 #include <asm/q40_master.h>
@@ -326,6 +330,7 @@ void q40_irq_disable(struct irq_data *data)
        }
 }
 
+#ifndef CONFIG_GENERIC_HARDIRQS
 unsigned long q40_probe_irq_on(void)
 {
        printk("irq probing not working - reconfigure the driver to avoid this\n");
@@ -335,3 +340,4 @@ int q40_probe_irq_off(unsigned long irqs)
 {
        return -1;
 }
+#endif