ath79: add ATH79_CPU_IRQ() macro

Remove the individual ATH79_CPU_IRQ_* constants and
use the new macro instead of those.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/4929/
Signed-off-by: John Crispin <blogic@openwrt.org>

1 files changed, 2 insertions, 7 deletions

diff --git a/arch/mips/include/asm/mach-ath79/irq.h b/arch/mips/include/asm/mach-ath79/irq.h
index 158ad7f41313..3dda4c24571d 100644
--- a/arch/mips/include/asm/mach-ath79/irq.h
+++ b/arch/mips/include/asm/mach-ath79/irq.h
@@ -12,6 +12,8 @@
 #define MIPS_CPU_IRQ_BASE       0
 #define NR_IRQS                 48
 
+#define ATH79_CPU_IRQ(_x)       (MIPS_CPU_IRQ_BASE + (_x))
+
 #define ATH79_MISC_IRQ_BASE     8
 #define ATH79_MISC_IRQ_COUNT    32
 #define ATH79_MISC_IRQ(_x)      (ATH79_MISC_IRQ_BASE + (_x))
@@ -24,13 +26,6 @@
 #define ATH79_IP2_IRQ_COUNT     2
 #define ATH79_IP2_IRQ(_x)       (ATH79_IP2_IRQ_BASE + (_x))
 
-#define ATH79_CPU_IRQ_IP2       (MIPS_CPU_IRQ_BASE + 2)
-#define ATH79_CPU_IRQ_USB       (MIPS_CPU_IRQ_BASE + 3)
-#define ATH79_CPU_IRQ_GE0       (MIPS_CPU_IRQ_BASE + 4)
-#define ATH79_CPU_IRQ_GE1       (MIPS_CPU_IRQ_BASE + 5)
-#define ATH79_CPU_IRQ_MISC      (MIPS_CPU_IRQ_BASE + 6)
-#define ATH79_CPU_IRQ_TIMER     (MIPS_CPU_IRQ_BASE + 7)
-
 #define ATH79_MISC_IRQ_TIMER    (ATH79_MISC_IRQ_BASE + 0)
 #define ATH79_MISC_IRQ_ERROR    (ATH79_MISC_IRQ_BASE + 1)
 #define ATH79_MISC_IRQ_GPIO     (ATH79_MISC_IRQ_BASE + 2)