From: Gabor Juhos <juhosg@openwrt.org>
Date: Thu, 6 Aug 2009 09:32:15 +0000 (+0000)
Subject: get rid of some ifdefs in the IRQ code
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e632633c5dbfc6eb2d13988b961f444233b0a87c;p=openwrt%2Fstaging%2Fansuel.git

get rid of some ifdefs in the IRQ code

SVN-Revision: 17141
---

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/irq.c b/target/linux/ar71xx/files/arch/mips/ar71xx/irq.c
index 6dcd9870f9..a778f5aab2 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/irq.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/irq.c
@@ -21,6 +21,8 @@
 
 #include <asm/mach-ar71xx/ar71xx.h>
 
+static void (* ar71xx_ip2_irq_handler)(void) = spurious_interrupt;
+
 #ifdef CONFIG_PCI
 static void ar71xx_pci_irq_dispatch(void)
 {
@@ -81,6 +83,8 @@ static void __init ar71xx_pci_irq_init(void)
 {
 	int i;
 
+	ar71xx_ip2_irq_handler = ar71xx_pci_irq_dispatch;
+
 	ar71xx_reset_wr(AR71XX_RESET_REG_PCI_INT_ENABLE, 0);
 	ar71xx_reset_wr(AR71XX_RESET_REG_PCI_INT_STATUS, 0);
 
@@ -156,6 +160,8 @@ static void __init ar724x_pci_irq_init(void)
 {
 	int i;
 
+	ar71xx_ip2_irq_handler = ar724x_pci_irq_dispatch;
+
 	ar724x_pci_wr(AR724X_PCI_REG_INT_MASK, 0);
 	ar724x_pci_wr(AR724X_PCI_REG_INT_STATUS, 0);
 
@@ -168,6 +174,9 @@ static void __init ar724x_pci_irq_init(void)
 
 	setup_irq(AR71XX_CPU_IRQ_PCI, &ar724x_pci_irqaction);
 }
+#else
+static inline void ar71xx_pci_irq_init(void) {}
+static inline void ar724x_pci_irq_init(void) {}
 #endif /* CONFIG_PCI */
 
 static void ar71xx_gpio_irq_dispatch(void)
@@ -355,8 +364,6 @@ static void ar913x_wmac_irq_dispatch(void)
 	do_IRQ(AR71XX_CPU_IRQ_WMAC);
 }
 
-static void (* ar71xx_ip2_irq_handler)(void) = spurious_interrupt;
-
 asmlinkage void plat_irq_dispatch(void)
 {
 	unsigned long pending;
@@ -395,16 +402,10 @@ void __init arch_init_irq(void)
 	case AR71XX_SOC_AR7130:
 	case AR71XX_SOC_AR7141:
 	case AR71XX_SOC_AR7161:
-#ifdef CONFIG_PCI
 		ar71xx_pci_irq_init();
-		ar71xx_ip2_irq_handler = ar71xx_pci_irq_dispatch;
-#endif
 		break;
 	case AR71XX_SOC_AR7240:
-#ifdef CONFIG_PCI
 		ar724x_pci_irq_init();
-		ar71xx_ip2_irq_handler = ar724x_pci_irq_dispatch;
-#endif
 		break;
 	case AR71XX_SOC_AR9130:
 	case AR71XX_SOC_AR9132: