lib: smc: Rename macro for extended args count am: 26df3487fa Original change: https://android-review.googlesource.com/c/trusty/lk/trusty/+/3516010 Change-Id: Ibca72fa96af0657a8d0800f83b58e180d1052269 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

diff --git a/lib/arm_ffa/arm_ffa.c b/lib/arm_ffa/arm_ffa.c
index 5c50adf..40b9a81 100644
--- a/lib/arm_ffa/arm_ffa.c
+++ b/lib/arm_ffa/arm_ffa.c

@@ -556,7 +556,7 @@
 status_t arm_ffa_msg_send_direct_req2(
         uuid_t uuid,
         uint16_t receiver_id,
-        uint64_t args[static REQ2_OTHER_PARAM_REGS],
+        uint64_t args[static ARM_FFA_MSG_EXTENDED_ARGS_COUNT],
         struct smc_ret18* resp) {
     struct smc_ret18 smc_ret;
     uint64_t uuid_lo_hi[2];

diff --git a/lib/arm_ffa/include/lib/arm_ffa/arm_ffa.h b/lib/arm_ffa/include/lib/arm_ffa/arm_ffa.h
index 57d4963..77a7fc9 100644
--- a/lib/arm_ffa/include/lib/arm_ffa/arm_ffa.h
+++ b/lib/arm_ffa/include/lib/arm_ffa/arm_ffa.h

@@ -188,10 +188,11 @@
  *
  * Return: 0 on success, LK error code on failure.
  */
-status_t arm_ffa_msg_send_direct_req2(uuid_t uuid,
-                                      uint16_t receiver_id,
-                                      uint64_t args[static REQ2_OTHER_PARAM_REGS],
-                                      struct smc_ret18* resp);
+status_t arm_ffa_msg_send_direct_req2(
+        uuid_t uuid,
+        uint16_t receiver_id,
+        uint64_t args[static ARM_FFA_MSG_EXTENDED_ARGS_COUNT],
+        struct smc_ret18* resp);
 
 /**
  * arm_ffa_console_log() - Output a buffer using %FFA_CONSOLE_LOG.
@@ -214,7 +215,7 @@
  */
 typedef status_t (*arm_ffa_direct_req2_handler_t)(
         uint16_t sender_id,
-        uint64_t regs[static REQ2_OTHER_PARAM_REGS]);
+        uint64_t regs[static ARM_FFA_MSG_EXTENDED_ARGS_COUNT]);
 
 /**
  * arm_ffa_handle_direct_req2() - Handle DIRECT_REQ2 call

diff --git a/lib/smc/include/lib/smc/smc.h b/lib/smc/include/lib/smc/smc.h
index d2aa5bc..bfeaa12 100644
--- a/lib/smc/include/lib/smc/smc.h
+++ b/lib/smc/include/lib/smc/smc.h

@@ -40,7 +40,7 @@
     ulong r7;
 };
 
-#define REQ2_OTHER_PARAM_REGS 14
+#define ARM_FFA_MSG_EXTENDED_ARGS_COUNT 14
 
 struct smc_ret18 {
     ulong r0;
@@ -64,7 +64,7 @@
             ulong r16;
             ulong r17;
         };
-        ulong req2_params[REQ2_OTHER_PARAM_REGS];
+        ulong req2_params[ARM_FFA_MSG_EXTENDED_ARGS_COUNT];
     };
 };