get rid of some ifdefs in the IRQ code

[openwrt/openwrt.git] / target / linux / ar71xx / files / arch / mips / ar71xx / irq.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/irq.c b/target/linux/ar71xx/files/arch/mips/ar71xx/irq.c
index 6bc1c6d5c4dca06b80a4660200b678dc7add9743..a778f5aab213e2add802f85803066525e2b24309 100644 (file)
--- 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)
@@ -213,7 +222,7 @@ static int ar71xx_gpio_irq_set_type(unsigned int irq, unsigned int flow_type)
 #define ar71xx_gpio_irq_set_type       NULL
 #endif
 
-struct irq_chip ar71xx_gpio_irq_chip = {
+static struct irq_chip ar71xx_gpio_irq_chip = {
        .name           = "AR71XX GPIO",
        .unmask         = ar71xx_gpio_irq_unmask,
        .mask           = ar71xx_gpio_irq_mask,
@@ -297,37 +306,30 @@ static void ar71xx_misc_irq_unmask(unsigned int irq)
        ar71xx_reset_rr(AR71XX_RESET_REG_MISC_INT_ENABLE);
 }
 
-static void ar724x_misc_irq_unmask(unsigned int irq)
+static void ar71xx_misc_irq_mask(unsigned int irq)
 {
        irq -= AR71XX_MISC_IRQ_BASE;
        ar71xx_reset_wr(AR71XX_RESET_REG_MISC_INT_ENABLE,
-               ar71xx_reset_rr(AR71XX_RESET_REG_MISC_INT_ENABLE) | (1 << irq));
+               ar71xx_reset_rr(AR71XX_RESET_REG_MISC_INT_ENABLE) & ~(1 << irq));
 
        /* flush write */
        ar71xx_reset_rr(AR71XX_RESET_REG_MISC_INT_ENABLE);
-
-       ar71xx_reset_wr(AR71XX_RESET_REG_MISC_INT_STATUS,
-               ar71xx_reset_rr(AR71XX_RESET_REG_MISC_INT_STATUS) & ~(1 << irq));
-
-       /* flush write */
-       ar71xx_reset_rr(AR71XX_RESET_REG_MISC_INT_STATUS);
 }
 
-static void ar71xx_misc_irq_mask(unsigned int irq)
+static void ar724x_misc_irq_ack(unsigned int irq)
 {
        irq -= AR71XX_MISC_IRQ_BASE;
-       ar71xx_reset_wr(AR71XX_RESET_REG_MISC_INT_ENABLE,
-               ar71xx_reset_rr(AR71XX_RESET_REG_MISC_INT_ENABLE) & ~(1 << irq));
+       ar71xx_reset_wr(AR71XX_RESET_REG_MISC_INT_STATUS,
+               ar71xx_reset_rr(AR71XX_RESET_REG_MISC_INT_STATUS) & ~(1 << irq));
 
        /* flush write */
-       ar71xx_reset_rr(AR71XX_RESET_REG_MISC_INT_ENABLE);
+       ar71xx_reset_rr(AR71XX_RESET_REG_MISC_INT_STATUS);
 }
 
-struct irq_chip ar71xx_misc_irq_chip = {
+static struct irq_chip ar71xx_misc_irq_chip = {
        .name           = "AR71XX MISC",
        .unmask         = ar71xx_misc_irq_unmask,
        .mask           = ar71xx_misc_irq_mask,
-       .mask_ack       = ar71xx_misc_irq_mask,
 };
 
 static struct irqaction ar71xx_misc_irqaction = {
@@ -343,7 +345,9 @@ static void __init ar71xx_misc_irq_init(void)
        ar71xx_reset_wr(AR71XX_RESET_REG_MISC_INT_STATUS, 0);
 
        if (ar71xx_soc == AR71XX_SOC_AR7240)
-               ar71xx_misc_irq_chip.unmask = ar724x_misc_irq_unmask;
+               ar71xx_misc_irq_chip.ack = ar724x_misc_irq_ack;
+       else
+               ar71xx_misc_irq_chip.mask_ack = ar71xx_misc_irq_mask;
 
        for (i = AR71XX_MISC_IRQ_BASE;
             i < AR71XX_MISC_IRQ_BASE + AR71XX_MISC_IRQ_COUNT; i++) {
@@ -360,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;
@@ -400,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: