summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorTom Hughes <tomhughes@chromium.org>2021-10-15 20:10:00 +0000
committerCommit Bot <commit-bot@chromium.org>2021-11-08 23:04:47 +0000
commit04e6a2380e1cbafb169c7194f0fc58d460193ea6 (patch)
treee745617c2bd08b81de129fa1da176a974fd9e7e1 /core
parentd1378e44168c901e5c5369fb966385da0dd6c259 (diff)
downloadchrome-ec-04e6a2380e1cbafb169c7194f0fc58d460193ea6.tar.gz
tree: Make DECLARE_IRQ routine static
For consistency, make all IRQ handler routines static. BRANCH=none BUG=b:172020503 TEST=make buildall -j Signed-off-by: Tom Hughes <tomhughes@chromium.org> Change-Id: I43dc4dd0a8cd593d6eb761768acc5c7b6b95e22b Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3227265 Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Diffstat (limited to 'core')
-rw-r--r--core/cortex-m/irq_handler.h2
-rw-r--r--core/cortex-m0/irq_handler.h4
-rw-r--r--core/host/irq_handler.h2
-rw-r--r--core/minute-ia/irq_handler.h2
-rw-r--r--core/nds32/irq_handler.h2
-rw-r--r--core/riscv-rv32i/irq_handler.h2
6 files changed, 7 insertions, 7 deletions
diff --git a/core/cortex-m/irq_handler.h b/core/cortex-m/irq_handler.h
index ae5d95cd94..9a69f8feeb 100644
--- a/core/cortex-m/irq_handler.h
+++ b/core/cortex-m/irq_handler.h
@@ -27,7 +27,7 @@
typedef struct { \
int fake[irq >= CONFIG_IRQ_COUNT ? -1 : 1]; \
} irq_num_check_##irq; \
- void __keep routine(void); \
+ static void __attribute__((used)) routine(void); \
void IRQ_HANDLER(irq)(void) \
{ \
asm volatile("mov r0, lr\n" \
diff --git a/core/cortex-m0/irq_handler.h b/core/cortex-m0/irq_handler.h
index de36ef7623..e528717420 100644
--- a/core/cortex-m0/irq_handler.h
+++ b/core/cortex-m0/irq_handler.h
@@ -21,7 +21,7 @@
#define DECLARE_IRQ(irq, routine, priority) DECLARE_IRQ_(irq, routine, priority)
#ifdef CONFIG_TASK_PROFILING
#define DECLARE_IRQ_(irq, routine, priority) \
- void routine(void); \
+ static void routine(void); \
void IRQ_HANDLER(irq)(void) \
{ \
void *ret = __builtin_return_address(0); \
@@ -35,7 +35,7 @@
#else /* CONFIG_TASK_PROFILING */
/* No Profiling : connect directly the IRQ vector */
#define DECLARE_IRQ_(irq, routine, priority) \
- void routine(void); \
+ static void routine(void); \
void IRQ_HANDLER(irq)(void) __attribute__((alias(STRINGIFY(routine))));\
const struct irq_priority __keep IRQ_PRIORITY(irq) \
__attribute__((section(".rodata.irqprio"))) \
diff --git a/core/host/irq_handler.h b/core/host/irq_handler.h
index f905f463c1..3947046f8c 100644
--- a/core/host/irq_handler.h
+++ b/core/host/irq_handler.h
@@ -16,7 +16,7 @@
* ensure it is enabled in the interrupt controller with the right priority.
*/
#define DECLARE_IRQ(irq, routine, priority) \
- void routine(void); \
+ static void routine(void); \
void IRQ_HANDLER(irq)(void) \
{ \
void *ret = __builtin_return_address(0); \
diff --git a/core/minute-ia/irq_handler.h b/core/minute-ia/irq_handler.h
index eec0ffddb4..d0f00a39f3 100644
--- a/core/minute-ia/irq_handler.h
+++ b/core/minute-ia/irq_handler.h
@@ -31,7 +31,7 @@ asm (".include \"core/minute-ia/irq_handler_common.S\"");
* to be used for dynamically setting up interrupt gates
*/
#define DECLARE_IRQ_(irq_, routine_, vector) \
- void __keep routine_(void); \
+ static void __attribute__((used)) routine_(void); \
void IRQ_HANDLER(irq_)(void); \
__asm__ (".section .rodata.irqs\n"); \
const struct irq_def __keep CONCAT4(__irq_, irq_, _, routine_) \
diff --git a/core/nds32/irq_handler.h b/core/nds32/irq_handler.h
index eb55d9e233..7f679fa57e 100644
--- a/core/nds32/irq_handler.h
+++ b/core/nds32/irq_handler.h
@@ -16,7 +16,7 @@
* ensure it is enabled in the interrupt controller with the right priority.
*/
#define DECLARE_IRQ(irq, routine, priority) \
- void routine(void); \
+ static void routine(void); \
void IRQ_HANDLER(CPU_INT(irq))(void) \
__attribute__ ((alias(STRINGIFY(routine)))); \
const struct irq_priority __keep IRQ_PRIORITY(CPU_INT(irq)) \
diff --git a/core/riscv-rv32i/irq_handler.h b/core/riscv-rv32i/irq_handler.h
index 6414f90c7f..b6f9a222ef 100644
--- a/core/riscv-rv32i/irq_handler.h
+++ b/core/riscv-rv32i/irq_handler.h
@@ -21,7 +21,7 @@
* ensure it is enabled in the interrupt controller with the right priority.
*/
#define DECLARE_IRQ(irq, routine, priority) \
- void routine(void); \
+ static void routine(void); \
void IRQ_HANDLER(CPU_INT(irq))(void) \
__attribute__ ((alias(STRINGIFY(routine)))); \
const struct irq_priority __keep IRQ_PRIORITY(CPU_INT(irq)) \