Fix compilation warning in Trusty SPD

In release builds, the Trusty SPD fails to build because of an unused
variable. Note that this warning message doesn't show in debug builds
because INFO() messages are not compiled out like in release mode.

This patch fixes this issue by removing this variable and using its
value in place directly in the INFO() macro call.

Change-Id: I1f552421181a09412315eef4eaca586012022018
Signed-off-by: Sandrine Bailleux <sandrine.bailleux@arm.com>

diff --git a/services/spd/trusty/trusty.c b/services/spd/trusty/trusty.c
index 4962d44a7e264bb356cbf0fba38b5a1e9a1d7e5b..7e8526d26e184a32a3ef0521b4b7acb82abb31b6 100644 (file)
--- a/services/spd/trusty/trusty.c
+++ b/services/spd/trusty/trusty.c
@@ -270,24 +270,22 @@ static int32_t trusty_init(void)
 static void trusty_cpu_suspend(void)
 {
        struct args ret;
-       unsigned int linear_id = plat_my_core_pos();
 
        ret = trusty_context_switch(NON_SECURE, SMC_FC_CPU_SUSPEND, 0, 0, 0);
        if (ret.r0 != 0) {
                INFO("%s: cpu %d, SMC_FC_CPU_SUSPEND returned unexpected value, %ld\n",
-                    __func__, linear_id, ret.r0);
+                    __func__, plat_my_core_pos(), ret.r0);
        }
 }
 
 static void trusty_cpu_resume(void)
 {
        struct args ret;
-       unsigned int linear_id = plat_my_core_pos();
 
        ret = trusty_context_switch(NON_SECURE, SMC_FC_CPU_RESUME, 0, 0, 0);
        if (ret.r0 != 0) {
                INFO("%s: cpu %d, SMC_FC_CPU_RESUME returned unexpected value, %ld\n",
-                    __func__, linear_id, ret.r0);
+                    __func__, plat_my_core_pos(), ret.r0);
        }
 }