From 403f5dace799cfe348a81d2f7aaa45d0b15a7ea7 Mon Sep 17 00:00:00 2001 From: Anna Lyons Date: Mon, 10 Dec 2018 14:29:03 +1100 Subject: [PATCH] Remove N_INTERRUPTS constant The N_INTERRUPTS constant is never used. maxIRQ tracks this value. --- include/plat/allwinnerA20/plat/machine.h | 2 -- include/plat/am335x/plat/machine.h | 2 -- include/plat/apq8064/plat/machine.h | 2 -- include/plat/bcm2837/plat/machine.h | 2 -- include/plat/exynos4/plat/machine.h | 2 -- include/plat/exynos5/plat/machine.h | 2 -- include/plat/hikey/plat/machine.h | 2 -- include/plat/imx31/plat/machine.h | 2 -- include/plat/imx6/plat/machine.h | 3 --- include/plat/imx7/plat/machine.h | 2 -- include/plat/omap3/plat/machine.h | 2 -- include/plat/spike/plat/machine.h | 3 --- include/plat/tk1/plat/machine.h | 2 -- include/plat/tx1/plat/machine.h | 2 -- include/plat/zynq7000/plat/machine.h | 2 -- include/plat/zynqmp/plat/machine.h | 2 -- 16 files changed, 34 deletions(-) diff --git a/include/plat/allwinnerA20/plat/machine.h b/include/plat/allwinnerA20/plat/machine.h index 2cc5c5bf5..8d9c9f7b1 100644 --- a/include/plat/allwinnerA20/plat/machine.h +++ b/include/plat/allwinnerA20/plat/machine.h @@ -13,8 +13,6 @@ #include -#define N_INTERRUPTS 122 - enum IRQConstants { SGI_0 = 0, SGI_1 = 1, diff --git a/include/plat/am335x/plat/machine.h b/include/plat/am335x/plat/machine.h index 50e7cec1d..5b8f30ae7 100644 --- a/include/plat/am335x/plat/machine.h +++ b/include/plat/am335x/plat/machine.h @@ -11,8 +11,6 @@ #ifndef __PLAT_MACHINE_H #define __PLAT_MACHINE_H -#define N_INTERRUPTS 128 - enum IRQConstants { DMTIMER0_IRQ = 66, SYS_INT_3PGSWRXINT0 = 41, diff --git a/include/plat/apq8064/plat/machine.h b/include/plat/apq8064/plat/machine.h index 9eaf93b82..7d0ab403c 100644 --- a/include/plat/apq8064/plat/machine.h +++ b/include/plat/apq8064/plat/machine.h @@ -13,8 +13,6 @@ #include -#define N_INTERRUPTS (maxIRQ + 1) - enum IRQConstants { // INTERRUPT_RESERVED = 0, // INTERRUPT_RESERVED = 1, diff --git a/include/plat/bcm2837/plat/machine.h b/include/plat/bcm2837/plat/machine.h index d95f81507..94e709598 100644 --- a/include/plat/bcm2837/plat/machine.h +++ b/include/plat/bcm2837/plat/machine.h @@ -16,8 +16,6 @@ #include #include -#define N_INTERRUPTS 96 - #define BASIC_IRQ_OFFSET 32 #define NORMAL_IRQ_OFFSET (BASIC_IRQ_OFFSET + 32) diff --git a/include/plat/exynos4/plat/machine.h b/include/plat/exynos4/plat/machine.h index a71ee4e80..b6eaa479d 100644 --- a/include/plat/exynos4/plat/machine.h +++ b/include/plat/exynos4/plat/machine.h @@ -11,8 +11,6 @@ #ifndef __PLAT_MACHINE_H #define __PLAT_MACHINE_H -#define N_INTERRUPTS 160 - enum IRQConstants { // INTERRUPT_RESERVED = 0, // INTERRUPT_RESERVED = 1, diff --git a/include/plat/exynos5/plat/machine.h b/include/plat/exynos5/plat/machine.h index d0e9186a8..879421397 100644 --- a/include/plat/exynos5/plat/machine.h +++ b/include/plat/exynos5/plat/machine.h @@ -13,8 +13,6 @@ #include -#define N_INTERRUPTS 160 - enum IRQConstants { // INTERRUPT_RESERVED = 0, // INTERRUPT_RESERVED = 1, diff --git a/include/plat/hikey/plat/machine.h b/include/plat/hikey/plat/machine.h index 355a0f6df..aecf86914 100644 --- a/include/plat/hikey/plat/machine.h +++ b/include/plat/hikey/plat/machine.h @@ -13,8 +13,6 @@ #include -#define N_INTERRUPTS 160 - enum IRQConstants { // INTERRUPT_RESERVED = 0, // INTERRUPT_RESERVED = 1, diff --git a/include/plat/imx31/plat/machine.h b/include/plat/imx31/plat/machine.h index fe6754736..a66d5600a 100644 --- a/include/plat/imx31/plat/machine.h +++ b/include/plat/imx31/plat/machine.h @@ -13,8 +13,6 @@ #define KERNEL_TIMER_IRQ INTERRUPT_EPIT1 -#define N_INTERRUPTS 64 - enum IRQConstants { INTERRUPT_PMU = 23, INTERRUPT_EPIT1 = 28, diff --git a/include/plat/imx6/plat/machine.h b/include/plat/imx6/plat/machine.h index 63d7c2666..b9e460df2 100644 --- a/include/plat/imx6/plat/machine.h +++ b/include/plat/imx6/plat/machine.h @@ -11,9 +11,6 @@ #ifndef __PLAT_MACHINE_H #define __PLAT_MACHINE_H - -#define N_INTERRUPTS 160 - enum IRQConstants { // INTERRUPT_RESERVED = 0, // INTERRUPT_RESERVED = 1, diff --git a/include/plat/imx7/plat/machine.h b/include/plat/imx7/plat/machine.h index c9a568295..1f5f58ed4 100644 --- a/include/plat/imx7/plat/machine.h +++ b/include/plat/imx7/plat/machine.h @@ -13,8 +13,6 @@ #include -#define N_INTERRUPTS 160 - /* pull some device interrupts from Linux device tree, need to * confirm them when the offcial manual is available. */ diff --git a/include/plat/omap3/plat/machine.h b/include/plat/omap3/plat/machine.h index 3b1adbfb0..e5c9465fb 100644 --- a/include/plat/omap3/plat/machine.h +++ b/include/plat/omap3/plat/machine.h @@ -11,8 +11,6 @@ #ifndef __PLAT_MACHINE_H #define __PLAT_MACHINE_H -#define N_INTERRUPTS 96 - enum IRQConstants { EMUINT = 0, COMMTX = 1, diff --git a/include/plat/spike/plat/machine.h b/include/plat/spike/plat/machine.h index 464fd68dd..c1db46407 100644 --- a/include/plat/spike/plat/machine.h +++ b/include/plat/spike/plat/machine.h @@ -19,9 +19,6 @@ #ifndef __PLAT_MACHINE_H #define __PLAT_MACHINE_H - -#define N_INTERRUPTS 6 - #ifndef __ASSEMBLER__ enum IRQConstants { INTERRUPT_SW = 0, diff --git a/include/plat/tk1/plat/machine.h b/include/plat/tk1/plat/machine.h index 3db60a567..54710e4d8 100644 --- a/include/plat/tk1/plat/machine.h +++ b/include/plat/tk1/plat/machine.h @@ -13,8 +13,6 @@ #include -#define N_INTERRUPTS 192 - enum IRQConstants { INTERRUPT_SGI_0 = 0, INTERRUPT_SGI_1 = 1, diff --git a/include/plat/tx1/plat/machine.h b/include/plat/tx1/plat/machine.h index 45d0f8b94..c03334857 100644 --- a/include/plat/tx1/plat/machine.h +++ b/include/plat/tx1/plat/machine.h @@ -13,8 +13,6 @@ #ifndef __PLAT_MACHINE_H #define __PLAT_MACHINE_H -#define N_INTERRUPTS 224 - enum IRQConstants { INTERRUPT_SGI_0 = 0, INTERRUPT_SGI_1 = 1, diff --git a/include/plat/zynq7000/plat/machine.h b/include/plat/zynq7000/plat/machine.h index 34069d52f..e47266060 100644 --- a/include/plat/zynq7000/plat/machine.h +++ b/include/plat/zynq7000/plat/machine.h @@ -11,8 +11,6 @@ #ifndef __PLAT_MACHINE_H #define __PLAT_MACHINE_H -#define N_INTERRUPTS 160 - enum IRQConstants { // INTERRUPT_RESERVED = 0, // INTERRUPT_RESERVED = 1, diff --git a/include/plat/zynqmp/plat/machine.h b/include/plat/zynqmp/plat/machine.h index c5a960833..97aaad168 100644 --- a/include/plat/zynqmp/plat/machine.h +++ b/include/plat/zynqmp/plat/machine.h @@ -23,8 +23,6 @@ #include #include -#define N_INTERRUPTS 96 - #define MAX_IRQ (187) enum IRQConstants { // INTERRUPT_RESERVED = 0,