diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2009-08-06 09:32:15 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2009-08-06 09:32:15 +0000 |
| commit | e632633c5dbfc6eb2d13988b961f444233b0a87c (patch) | |
| tree | c0b84b83439873b090545f379ccb8603e74c4381 /target/linux/ar71xx/files | |
| parent | 59c1e90fd7a31421c627cc5746f5cd89d85e683e (diff) | |
| download | mtk-20170518-e632633c5dbfc6eb2d13988b961f444233b0a87c.zip mtk-20170518-e632633c5dbfc6eb2d13988b961f444233b0a87c.tar.gz mtk-20170518-e632633c5dbfc6eb2d13988b961f444233b0a87c.tar.bz2 | |
get rid of some ifdefs in the IRQ code
SVN-Revision: 17141
Diffstat (limited to 'target/linux/ar71xx/files')
| -rw-r--r-- | target/linux/ar71xx/files/arch/mips/ar71xx/irq.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/irq.c b/target/linux/ar71xx/files/arch/mips/ar71xx/irq.c index 6dcd987..a778f5a 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: |