From 0ec5e93771dafd55c1042d91dd098cb692a6a9b1 Mon Sep 17 00:00:00 2001 From: Anna Lyons <Anna.Lyons@nicta.com.au> Date: Tue, 7 Jun 2016 09:01:41 +1000 Subject: [PATCH] SELFOUR-402: remove isReservedIRQ While provided by each hardware platform this function is never called. --- .../plat/allwinnerA20/plat/machine/hardware.h | 1 - include/plat/am335x/plat/machine/hardware.h | 1 - include/plat/apq8064/plat/machine/hardware.h | 1 - include/plat/exynos4/plat/machine/hardware.h | 1 - include/plat/exynos5/plat/machine/hardware.h | 1 - include/plat/hikey/plat/machine/hardware.h | 1 - include/plat/imx31/plat/machine/hardware.h | 1 - include/plat/imx6/plat/machine/hardware.h | 1 - include/plat/imx7/plat/machine/hardware.h | 1 - include/plat/omap3/plat/machine/hardware.h | 1 - include/plat/tk1/plat/machine/hardware.h | 1 - include/plat/zynq7000/plat/machine/hardware.h | 1 - src/plat/allwinnerA20/machine/hardware.c | 11 --------- src/plat/am335x/machine/hardware.c | 7 ------ src/plat/apq8064/machine/hardware.c | 7 ------ src/plat/exynos4/machine/hardware.c | 7 ------ src/plat/exynos5/machine/hardware.c | 8 ------- src/plat/hikey/machine/hardware.c | 8 ------- src/plat/imx31/machine/hardware.c | 7 ------ src/plat/imx6/machine/hardware.c | 8 ------- src/plat/imx7/machine/hardware.c | 8 ------- src/plat/omap3/machine/hardware.c | 24 ------------------- src/plat/tk1/machine/hardware.c | 7 ------ src/plat/zynq7000/machine/hardware.c | 7 ------ 24 files changed, 121 deletions(-) diff --git a/include/plat/allwinnerA20/plat/machine/hardware.h b/include/plat/allwinnerA20/plat/machine/hardware.h index 00a9b3611..7e4b216e5 100755 --- a/include/plat/allwinnerA20/plat/machine/hardware.h +++ b/include/plat/allwinnerA20/plat/machine/hardware.h @@ -63,7 +63,6 @@ int get_num_dev_p_regs(void); p_region_t get_dev_p_reg(word_t i); void map_kernel_devices(void); -bool_t CONST isReservedIRQ(irq_t irq); void handleReservedIRQ(irq_t irq); /** MODIFIES: [*] */ diff --git a/include/plat/am335x/plat/machine/hardware.h b/include/plat/am335x/plat/machine/hardware.h index 294cb5506..29ea8a894 100644 --- a/include/plat/am335x/plat/machine/hardware.h +++ b/include/plat/am335x/plat/machine/hardware.h @@ -63,7 +63,6 @@ int get_num_dev_p_regs(void); p_region_t get_dev_p_reg(word_t i); void map_kernel_devices(void); -bool_t CONST isReservedIRQ(irq_t irq); void handleReservedIRQ(irq_t irq); void ackInterrupt(irq_t irq); bool_t isIRQPending(void); diff --git a/include/plat/apq8064/plat/machine/hardware.h b/include/plat/apq8064/plat/machine/hardware.h index c4cfab5a7..08f566915 100644 --- a/include/plat/apq8064/plat/machine/hardware.h +++ b/include/plat/apq8064/plat/machine/hardware.h @@ -66,7 +66,6 @@ int get_num_dev_p_regs(void); p_region_t get_dev_p_reg(word_t i); void map_kernel_devices(void); -bool_t CONST isReservedIRQ(irq_t irq); void handleReservedIRQ(irq_t irq); /** MODIFIES: [*] */ diff --git a/include/plat/exynos4/plat/machine/hardware.h b/include/plat/exynos4/plat/machine/hardware.h index 34987ea76..ec5f95790 100644 --- a/include/plat/exynos4/plat/machine/hardware.h +++ b/include/plat/exynos4/plat/machine/hardware.h @@ -75,7 +75,6 @@ int get_num_dev_p_regs(void); p_region_t get_dev_p_reg(word_t i); void map_kernel_devices(void); -bool_t CONST isReservedIRQ(irq_t irq); void handleReservedIRQ(irq_t irq); /** MODIFIES: [*] */ diff --git a/include/plat/exynos5/plat/machine/hardware.h b/include/plat/exynos5/plat/machine/hardware.h index 14211ab1e..4b55c6d0b 100644 --- a/include/plat/exynos5/plat/machine/hardware.h +++ b/include/plat/exynos5/plat/machine/hardware.h @@ -74,7 +74,6 @@ int get_num_dev_p_regs(void); p_region_t get_dev_p_reg(word_t i); void map_kernel_devices(void); -bool_t CONST isReservedIRQ(irq_t irq); void handleReservedIRQ(irq_t irq); /** MODIFIES: [*] */ diff --git a/include/plat/hikey/plat/machine/hardware.h b/include/plat/hikey/plat/machine/hardware.h index 3adba10b2..6f0a902b4 100755 --- a/include/plat/hikey/plat/machine/hardware.h +++ b/include/plat/hikey/plat/machine/hardware.h @@ -63,7 +63,6 @@ int get_num_dev_p_regs(void); p_region_t get_dev_p_reg(unsigned int i); void map_kernel_devices(void); -bool_t CONST isReservedIRQ(irq_t irq); void handleReservedIRQ(irq_t irq); /** MODIFIES: [*] */ diff --git a/include/plat/imx31/plat/machine/hardware.h b/include/plat/imx31/plat/machine/hardware.h index f7d7148c8..1f3eea8d4 100644 --- a/include/plat/imx31/plat/machine/hardware.h +++ b/include/plat/imx31/plat/machine/hardware.h @@ -64,7 +64,6 @@ int get_num_dev_p_regs(void); p_region_t get_dev_p_reg(word_t i); void map_kernel_devices(void); -bool_t CONST isReservedIRQ(irq_t irq); void handleReservedIRQ(irq_t irq); void ackInterrupt(irq_t irq); bool_t isIRQPending(void); diff --git a/include/plat/imx6/plat/machine/hardware.h b/include/plat/imx6/plat/machine/hardware.h index 5b15d2a03..a23c5411c 100644 --- a/include/plat/imx6/plat/machine/hardware.h +++ b/include/plat/imx6/plat/machine/hardware.h @@ -76,7 +76,6 @@ int get_num_dev_p_regs(void); p_region_t get_dev_p_reg(word_t i); void map_kernel_devices(void); -bool_t CONST isReservedIRQ(irq_t irq); void handleReservedIRQ(irq_t irq); diff --git a/include/plat/imx7/plat/machine/hardware.h b/include/plat/imx7/plat/machine/hardware.h index c23635f79..026193ba3 100644 --- a/include/plat/imx7/plat/machine/hardware.h +++ b/include/plat/imx7/plat/machine/hardware.h @@ -74,7 +74,6 @@ int get_num_dev_p_regs(void); p_region_t get_dev_p_reg(word_t i); void map_kernel_devices(void); -bool_t CONST isReservedIRQ(irq_t irq); void handleReservedIRQ(irq_t irq); static inline void diff --git a/include/plat/omap3/plat/machine/hardware.h b/include/plat/omap3/plat/machine/hardware.h index 294cb5506..29ea8a894 100644 --- a/include/plat/omap3/plat/machine/hardware.h +++ b/include/plat/omap3/plat/machine/hardware.h @@ -63,7 +63,6 @@ int get_num_dev_p_regs(void); p_region_t get_dev_p_reg(word_t i); void map_kernel_devices(void); -bool_t CONST isReservedIRQ(irq_t irq); void handleReservedIRQ(irq_t irq); void ackInterrupt(irq_t irq); bool_t isIRQPending(void); diff --git a/include/plat/tk1/plat/machine/hardware.h b/include/plat/tk1/plat/machine/hardware.h index 98f3d6756..733cebb92 100644 --- a/include/plat/tk1/plat/machine/hardware.h +++ b/include/plat/tk1/plat/machine/hardware.h @@ -63,7 +63,6 @@ int get_num_dev_p_regs(void); p_region_t get_dev_p_reg(word_t i); void map_kernel_devices(void); -bool_t CONST isReservedIRQ(irq_t irq); void handleReservedIRQ(irq_t irq); /** MODIFIES: [*] */ diff --git a/include/plat/zynq7000/plat/machine/hardware.h b/include/plat/zynq7000/plat/machine/hardware.h index 9a8ce2b06..07998c40c 100644 --- a/include/plat/zynq7000/plat/machine/hardware.h +++ b/include/plat/zynq7000/plat/machine/hardware.h @@ -76,7 +76,6 @@ int get_num_dev_p_regs(void); p_region_t get_dev_p_reg(word_t i); void map_kernel_devices(void); -bool_t CONST isReservedIRQ(irq_t irq); void handleReservedIRQ(irq_t irq); diff --git a/src/plat/allwinnerA20/machine/hardware.c b/src/plat/allwinnerA20/machine/hardware.c index c3e3ffe5a..1f9a1c585 100755 --- a/src/plat/allwinnerA20/machine/hardware.c +++ b/src/plat/allwinnerA20/machine/hardware.c @@ -57,17 +57,6 @@ BOOT_CODE p_region_t get_dev_p_reg(word_t i) return dev_p_regs[i]; } - -/* Determine if the given IRQ should be reserved by the kernel. */ -bool_t CONST -isReservedIRQ(irq_t irq) -{ - return irq == KERNEL_TIMER_IRQ || - irq == RESERVED_IRQ01 || - irq == RESERVED_IRQ02 || - irq == RESERVED_IRQ03; -} - /* Handle a platform-reserved IRQ. */ void handleReservedIRQ(irq_t irq) diff --git a/src/plat/am335x/machine/hardware.c b/src/plat/am335x/machine/hardware.c index e9457db3d..0ed107b97 100644 --- a/src/plat/am335x/machine/hardware.c +++ b/src/plat/am335x/machine/hardware.c @@ -219,13 +219,6 @@ maskInterrupt(bool_t disable, interrupt_t irq) } } -/* Determine if the given IRQ should be reserved by the kernel. */ -bool_t -isReservedIRQ(interrupt_t irq) -{ - return irq == KERNEL_TIMER_IRQ; -} - /* Handle a platform-reserved IRQ. */ void handleReservedIRQ(irq_t irq) { diff --git a/src/plat/apq8064/machine/hardware.c b/src/plat/apq8064/machine/hardware.c index ca3840229..4ebae8e47 100644 --- a/src/plat/apq8064/machine/hardware.c +++ b/src/plat/apq8064/machine/hardware.c @@ -296,13 +296,6 @@ get_dev_p_reg(word_t i) } -/* Determine if the given IRQ should be reserved by the kernel. */ -bool_t CONST -isReservedIRQ(irq_t irq) -{ - return irq == KERNEL_TIMER_IRQ; -} - /* Handle a platform-reserved IRQ. */ void handleReservedIRQ(irq_t irq) diff --git a/src/plat/exynos4/machine/hardware.c b/src/plat/exynos4/machine/hardware.c index ced2a4647..26ad4c223 100644 --- a/src/plat/exynos4/machine/hardware.c +++ b/src/plat/exynos4/machine/hardware.c @@ -211,13 +211,6 @@ get_dev_p_reg(word_t i) } -/* Determine if the given IRQ should be reserved by the kernel. */ -bool_t CONST -isReservedIRQ(irq_t irq) -{ - return irq == KERNEL_TIMER_IRQ; -} - /* Handle a platform-reserved IRQ. */ void handleReservedIRQ(irq_t irq) diff --git a/src/plat/exynos5/machine/hardware.c b/src/plat/exynos5/machine/hardware.c index 246dc867d..cc99b2417 100644 --- a/src/plat/exynos5/machine/hardware.c +++ b/src/plat/exynos5/machine/hardware.c @@ -270,14 +270,6 @@ get_dev_p_reg(word_t i) return dev_p_regs[i]; } - -/* Determine if the given IRQ should be reserved by the kernel. */ -bool_t CONST -isReservedIRQ(irq_t irq) -{ - return irq == INTERRUPT_WDT; -} - /* Handle a platform-reserved IRQ. */ void handleReservedIRQ(irq_t irq) diff --git a/src/plat/hikey/machine/hardware.c b/src/plat/hikey/machine/hardware.c index 3853870cc..22bd1c9a0 100644 --- a/src/plat/hikey/machine/hardware.c +++ b/src/plat/hikey/machine/hardware.c @@ -56,14 +56,6 @@ BOOT_CODE p_region_t get_dev_p_reg(unsigned int i) return dev_p_regs[i]; } - -/* Determine if the given IRQ should be reserved by the kernel. */ -bool_t CONST -isReservedIRQ(irq_t irq) -{ - return irq == KERNEL_TIMER_IRQ; -} - /* Handle a platform-reserved IRQ. */ void handleReservedIRQ(irq_t irq) diff --git a/src/plat/imx31/machine/hardware.c b/src/plat/imx31/machine/hardware.c index 651a44e2d..7163daf4b 100644 --- a/src/plat/imx31/machine/hardware.c +++ b/src/plat/imx31/machine/hardware.c @@ -175,13 +175,6 @@ maskInterrupt(bool_t disable, interrupt_t irq) } } -/* Determine if the given IRQ should be reserved by the kernel. */ -bool_t CONST -isReservedIRQ(irq_t irq) -{ - return false; -} - /* Handle a platform-reserved IRQ. */ void handleReservedIRQ(irq_t irq) diff --git a/src/plat/imx6/machine/hardware.c b/src/plat/imx6/machine/hardware.c index 3c0e1475f..66bdfb7c3 100644 --- a/src/plat/imx6/machine/hardware.c +++ b/src/plat/imx6/machine/hardware.c @@ -194,14 +194,6 @@ get_dev_p_reg(word_t i) return dev_p_regs[i]; } - -/* Determine if the given IRQ should be reserved by the kernel. */ -bool_t CONST -isReservedIRQ(irq_t irq) -{ - return irq == KERNEL_TIMER_IRQ; -} - /* Handle a platform-reserved IRQ. */ void handleReservedIRQ(irq_t irq) diff --git a/src/plat/imx7/machine/hardware.c b/src/plat/imx7/machine/hardware.c index ccfc8c05e..2590db869 100644 --- a/src/plat/imx7/machine/hardware.c +++ b/src/plat/imx7/machine/hardware.c @@ -103,14 +103,6 @@ get_dev_p_reg(word_t i) return dev_p_regs[i]; } - -/* Determine if the given IRQ should be reserved by the kernel. */ -bool_t CONST -isReservedIRQ(irq_t irq) -{ - return irq == KERNEL_TIMER_IRQ; -} - /* Handle a platform-reserved IRQ. */ void handleReservedIRQ(irq_t irq) diff --git a/src/plat/omap3/machine/hardware.c b/src/plat/omap3/machine/hardware.c index 7e6d67615..5fbb2700b 100644 --- a/src/plat/omap3/machine/hardware.c +++ b/src/plat/omap3/machine/hardware.c @@ -291,30 +291,6 @@ maskInterrupt(bool_t disable, interrupt_t irq) } } -/* Determine if the given IRQ should be reserved by the kernel. */ -bool_t -isReservedIRQ(interrupt_t irq) -{ - return irq == RESERVED_IRQ01 || - irq == RESERVED_IRQ02 || - irq == RESERVED_IRQ03 || - irq == RESERVED_IRQ04 || - irq == RESERVED_IRQ05 || - irq == RESERVED_IRQ06 || - irq == RESERVED_IRQ07 || - irq == RESERVED_IRQ08 || - irq == RESERVED_IRQ09 || - irq == RESERVED_IRQ10 || - irq == RESERVED_IRQ11 || - irq == RESERVED_IRQ12 || - irq == RESERVED_IRQ13 || - irq == RESERVED_IRQ14 || - irq == RESERVED_IRQ15 || - irq == RESERVED_IRQ16 || - irq == RESERVED_IRQ17 || - irq == RESERVED_IRQ18; -} - /* Handle a platform-reserved IRQ. */ void handleReservedIRQ(irq_t irq) { diff --git a/src/plat/tk1/machine/hardware.c b/src/plat/tk1/machine/hardware.c index b879e05c8..d4dc98a7c 100644 --- a/src/plat/tk1/machine/hardware.c +++ b/src/plat/tk1/machine/hardware.c @@ -116,13 +116,6 @@ BOOT_CODE p_region_t get_dev_p_reg(word_t i) } -/* Determine if the given IRQ should be reserved by the kernel. */ -bool_t CONST -isReservedIRQ(irq_t irq) -{ - return irq == KERNEL_TIMER_IRQ; -} - /* Handle a platform-reserved IRQ. */ void handleReservedIRQ(irq_t irq) diff --git a/src/plat/zynq7000/machine/hardware.c b/src/plat/zynq7000/machine/hardware.c index 6f273303a..a35a47f28 100644 --- a/src/plat/zynq7000/machine/hardware.c +++ b/src/plat/zynq7000/machine/hardware.c @@ -114,13 +114,6 @@ get_dev_p_reg(word_t i) } -/* Determine if the given IRQ should be reserved by the kernel. */ -bool_t CONST -isReservedIRQ(irq_t irq) -{ - return irq == KERNEL_TIMER_IRQ; -} - /* Handle a platform-reserved IRQ. */ void handleReservedIRQ(irq_t irq) -- GitLab