From 724fd958c3f4507b2282524665a878f0169de864 Mon Sep 17 00:00:00 2001
From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Thu, 19 Apr 2018 01:14:42 +0900
Subject: [PATCH] spd: add static qualifier to locally used functions and data
These are used locally in a file.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
services/spd/opteed/opteed_main.c | 4 ++--
services/spd/tlkd/tlkd_main.c | 8 ++++----
services/spd/trusty/trusty.c | 2 +-
services/spd/tspd/tspd_main.c | 4 ++--
services/spd/tspd/tspd_private.h | 10 ----------
5 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/services/spd/opteed/opteed_main.c b/services/spd/opteed/opteed_main.c
index 3d679806c..a9e4ece2d 100644
--- a/services/spd/opteed/opteed_main.c
+++ b/services/spd/opteed/opteed_main.c
@@ -90,7 +90,7 @@ static uint64_t opteed_sel1_interrupt_handler(uint32_t id,
* (aarch32/aarch64) if not already known and initialises the context for entry
* into OPTEE for its initialization.
******************************************************************************/
-int32_t opteed_setup(void)
+static int32_t opteed_setup(void)
{
entry_point_info_t *optee_ep_info;
uint32_t linear_id;
@@ -187,7 +187,7 @@ static int32_t opteed_init(void)
* state. Lastly it will also return any information that OPTEE needs to do
* the work assigned to it.
******************************************************************************/
-uint64_t opteed_smc_handler(uint32_t smc_fid,
+static uint64_t opteed_smc_handler(uint32_t smc_fid,
uint64_t x1,
uint64_t x2,
uint64_t x3,
diff --git a/services/spd/tlkd/tlkd_main.c b/services/spd/tlkd/tlkd_main.c
index da3b732e5..961fd1825 100644
--- a/services/spd/tlkd/tlkd_main.c
+++ b/services/spd/tlkd/tlkd_main.c
@@ -44,14 +44,14 @@ DEFINE_SVC_UUID(tlk_uuid,
0xbd11e9c9, 0x2bba, 0x52ee, 0xb1, 0x72,
0x46, 0x1f, 0xba, 0x97, 0x7f, 0x63);
-int32_t tlkd_init(void);
+static int32_t tlkd_init(void);
/*******************************************************************************
* Secure Payload Dispatcher setup. The SPD finds out the SP entrypoint and type
* (aarch32/aarch64) if not already known and initialises the context for entry
* into the SP for its initialisation.
******************************************************************************/
-int32_t tlkd_setup(void)
+static int32_t tlkd_setup(void)
{
entry_point_info_t *tlk_ep_info;
@@ -100,7 +100,7 @@ int32_t tlkd_setup(void)
* used. This function performs a synchronous entry into the Secure payload.
* The SP passes control back to this routine through a SMC.
******************************************************************************/
-int32_t tlkd_init(void)
+static int32_t tlkd_init(void)
{
entry_point_info_t *tlk_entry_point;
@@ -133,7 +133,7 @@ int32_t tlkd_init(void)
* will also return any information that the secure payload needs to do the
* work assigned to it.
******************************************************************************/
-uint64_t tlkd_smc_handler(uint32_t smc_fid,
+static uint64_t tlkd_smc_handler(uint32_t smc_fid,
uint64_t x1,
uint64_t x2,
uint64_t x3,
diff --git a/services/spd/trusty/trusty.c b/services/spd/trusty/trusty.c
index 97f202cba..f5501c924 100644
--- a/services/spd/trusty/trusty.c
+++ b/services/spd/trusty/trusty.c
@@ -53,7 +53,7 @@ struct args {
uint64_t r7;
};
-struct trusty_cpu_ctx trusty_cpu_ctx[PLATFORM_CORE_COUNT];
+static struct trusty_cpu_ctx trusty_cpu_ctx[PLATFORM_CORE_COUNT];
struct args trusty_init_context_stack(void **sp, void *new_stack);
struct args trusty_context_switch_helper(void **sp, void *smc_params);
diff --git a/services/spd/tspd/tspd_main.c b/services/spd/tspd/tspd_main.c
index 2312205c8..279da987c 100644
--- a/services/spd/tspd/tspd_main.c
+++ b/services/spd/tspd/tspd_main.c
@@ -179,7 +179,7 @@ static uint64_t tspd_ns_interrupt_handler(uint32_t id,
* (aarch32/aarch64) if not already known and initialises the context for entry
* into the SP for its initialisation.
******************************************************************************/
-int32_t tspd_setup(void)
+static int32_t tspd_setup(void)
{
entry_point_info_t *tsp_ep_info;
uint32_t linear_id;
@@ -273,7 +273,7 @@ int32_t tspd_init(void)
* will also return any information that the secure payload needs to do the
* work assigned to it.
******************************************************************************/
-uint64_t tspd_smc_handler(uint32_t smc_fid,
+static uint64_t tspd_smc_handler(uint32_t smc_fid,
uint64_t x1,
uint64_t x2,
uint64_t x3,
diff --git a/services/spd/tspd/tspd_private.h b/services/spd/tspd/tspd_private.h
index a63daff10..692a967e3 100644
--- a/services/spd/tspd/tspd_private.h
+++ b/services/spd/tspd/tspd_private.h
@@ -221,16 +221,6 @@ void tspd_init_tsp_ep_state(struct entry_point_info *tsp_entry_point,
tsp_context_t *tsp_ctx);
int tspd_abort_preempted_smc(tsp_context_t *tsp_ctx);
-uint64_t tspd_smc_handler(uint32_t smc_fid,
- uint64_t x1,
- uint64_t x2,
- uint64_t x3,
- uint64_t x4,
- void *cookie,
- void *handle,
- uint64_t flags);
-
-int32_t tspd_setup(void);
uint64_t tspd_handle_sp_preemption(void *handle);
extern tsp_context_t tspd_sp_context[TSPD_CORE_COUNT];
--
GitLab