Enhancement: Adding -Wextra compiler option.

             This enables some extra warning flags that are not
             enabled by -Wall.

Signed-off-by: Vinay Kumar Kotegowder <vinaykumar.kotegowder@arm.com>
diff --git a/api-tests/dev_apis/crypto/test_c001/test_c001.c b/api-tests/dev_apis/crypto/test_c001/test_c001.c
index fec7371..67cd11d 100644
--- a/api-tests/dev_apis/crypto/test_c001/test_c001.c
+++ b/api-tests/dev_apis/crypto/test_c001/test_c001.c
@@ -27,7 +27,7 @@
     NULL,
 };
 
-int32_t psa_generate_random_without_init_test(caller_security_t caller)
+int32_t psa_generate_random_without_init_test(caller_security_t caller __UNUSED)
 {
     uint8_t         output[GENERATE_SIZE];
     int32_t         status;
@@ -44,7 +44,7 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t psa_crypto_init_test(caller_security_t caller)
+int32_t psa_crypto_init_test(caller_security_t caller __UNUSED)
 {
     int32_t        status;
 
@@ -57,7 +57,7 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t multiple_psa_crypto_init_test(caller_security_t caller)
+int32_t multiple_psa_crypto_init_test(caller_security_t caller __UNUSED)
 {
     int32_t         i, status;
 
diff --git a/api-tests/dev_apis/crypto/test_c002/test_c002.c b/api-tests/dev_apis/crypto/test_c002/test_c002.c
index bafc179..065a379 100644
--- a/api-tests/dev_apis/crypto/test_c002/test_c002.c
+++ b/api-tests/dev_apis/crypto/test_c002/test_c002.c
@@ -29,7 +29,7 @@
 
 static int g_test_count = 1;
 
-int32_t psa_import_key_test(caller_security_t caller)
+int32_t psa_import_key_test(caller_security_t caller __UNUSED)
 {
     int32_t               i, status;
     uint8_t               data[BUFFER_SIZE];
diff --git a/api-tests/dev_apis/crypto/test_c003/test_c003.c b/api-tests/dev_apis/crypto/test_c003/test_c003.c
index 4f9fa82..5a0d805 100644
--- a/api-tests/dev_apis/crypto/test_c003/test_c003.c
+++ b/api-tests/dev_apis/crypto/test_c003/test_c003.c
@@ -29,7 +29,7 @@
 static int      g_test_count = 1;
 static uint8_t  data[BUFFER_SIZE];
 
-int32_t psa_export_key_test(caller_security_t caller)
+int32_t psa_export_key_test(caller_security_t caller __UNUSED)
 {
     int32_t               i, status;
     size_t                length;
diff --git a/api-tests/dev_apis/crypto/test_c004/test_c004.c b/api-tests/dev_apis/crypto/test_c004/test_c004.c
index 983ae54..8f24c59 100644
--- a/api-tests/dev_apis/crypto/test_c004/test_c004.c
+++ b/api-tests/dev_apis/crypto/test_c004/test_c004.c
@@ -29,7 +29,7 @@
 static int          g_test_count = 1;
 static uint8_t      data[BUFFER_SIZE];
 
-int32_t test_psa_export_public_key(caller_security_t caller)
+int32_t test_psa_export_public_key(caller_security_t caller __UNUSED)
 {
     int32_t               i, status;
     size_t                length;
diff --git a/api-tests/dev_apis/crypto/test_c005/test_c005.c b/api-tests/dev_apis/crypto/test_c005/test_c005.c
index d66e9f7..c6ee0d8 100644
--- a/api-tests/dev_apis/crypto/test_c005/test_c005.c
+++ b/api-tests/dev_apis/crypto/test_c005/test_c005.c
@@ -28,7 +28,7 @@
 
 static int g_test_count = 1;
 
-int32_t psa_destroy_key_test(caller_security_t caller)
+int32_t psa_destroy_key_test(caller_security_t caller __UNUSED)
 {
     int32_t               i, status;
     const uint8_t        *key_data;
diff --git a/api-tests/dev_apis/crypto/test_c006/test_c006.c b/api-tests/dev_apis/crypto/test_c006/test_c006.c
index 9816a5f..f6cd6f9 100644
--- a/api-tests/dev_apis/crypto/test_c006/test_c006.c
+++ b/api-tests/dev_apis/crypto/test_c006/test_c006.c
@@ -29,7 +29,7 @@
 
 static int g_test_count = 1;
 
-int32_t psa_hash_compute_test(caller_security_t caller)
+int32_t psa_hash_compute_test(caller_security_t caller __UNUSED)
 {
     int                     num_checks = sizeof(check1)/sizeof(check1[0]);
     int32_t                 i, status;
diff --git a/api-tests/dev_apis/crypto/test_c007/test_c007.c b/api-tests/dev_apis/crypto/test_c007/test_c007.c
index d3046c1..9a4e859 100644
--- a/api-tests/dev_apis/crypto/test_c007/test_c007.c
+++ b/api-tests/dev_apis/crypto/test_c007/test_c007.c
@@ -29,7 +29,7 @@
 
 static int g_test_count = 1;
 
-int32_t psa_hash_compare_test(caller_security_t caller)
+int32_t psa_hash_compare_test(caller_security_t caller __UNUSED)
 {
     int                     num_checks = sizeof(check1)/sizeof(check1[0]);
     int32_t                 i, status;
diff --git a/api-tests/dev_apis/crypto/test_c008/test_c008.c b/api-tests/dev_apis/crypto/test_c008/test_c008.c
index a4e8387..2ee5dd5 100644
--- a/api-tests/dev_apis/crypto/test_c008/test_c008.c
+++ b/api-tests/dev_apis/crypto/test_c008/test_c008.c
@@ -29,7 +29,7 @@
 
 static int g_test_count = 1;
 
-int32_t psa_key_derivation_setup_test(caller_security_t caller)
+int32_t psa_key_derivation_setup_test(caller_security_t caller __UNUSED)
 {
     int32_t                         i, status;
     int                             num_checks = sizeof(check1)/sizeof(check1[0]);
diff --git a/api-tests/dev_apis/crypto/test_c009/test_c009.c b/api-tests/dev_apis/crypto/test_c009/test_c009.c
index 0dd6dc2..3f0775b 100644
--- a/api-tests/dev_apis/crypto/test_c009/test_c009.c
+++ b/api-tests/dev_apis/crypto/test_c009/test_c009.c
@@ -29,7 +29,7 @@
 
 static int g_test_count = 1;
 
-int32_t psa_key_derivation_input_bytes_test(caller_security_t caller)
+int32_t psa_key_derivation_input_bytes_test(caller_security_t caller __UNUSED)
 {
     int32_t                        i, status;
     int                            num_checks = sizeof(check1)/sizeof(check1[0]);
diff --git a/api-tests/dev_apis/crypto/test_c010/test_c010.c b/api-tests/dev_apis/crypto/test_c010/test_c010.c
index 2e29adb..68a8701 100644
--- a/api-tests/dev_apis/crypto/test_c010/test_c010.c
+++ b/api-tests/dev_apis/crypto/test_c010/test_c010.c
@@ -29,7 +29,7 @@
 
 static int g_test_count = 1;
 
-int32_t psa_key_attributes_set_get_test(caller_security_t caller)
+int32_t psa_key_attributes_set_get_test(caller_security_t caller __UNUSED)
 {
     int32_t               i, status;
     psa_key_type_t        get_key_type;
diff --git a/api-tests/dev_apis/crypto/test_c010/test_data.h b/api-tests/dev_apis/crypto/test_c010/test_data.h
index 2854892..c8ece76 100644
--- a/api-tests/dev_apis/crypto/test_c010/test_data.h
+++ b/api-tests/dev_apis/crypto/test_c010/test_data.h
@@ -25,7 +25,6 @@
     psa_algorithm_t         key_alg;
     psa_key_id_t            key_id;
     psa_key_lifetime_t      key_lifetime;
-    psa_key_lifetime_t      lifetime;
 } test_data;
 
 static const test_data check1[] = {
diff --git a/api-tests/dev_apis/crypto/test_c011/test_c011.c b/api-tests/dev_apis/crypto/test_c011/test_c011.c
index 5f15b18..9362046 100644
--- a/api-tests/dev_apis/crypto/test_c011/test_c011.c
+++ b/api-tests/dev_apis/crypto/test_c011/test_c011.c
@@ -29,7 +29,7 @@
 
 static int g_test_count = 1;
 
-int32_t psa_hash_setup_test(caller_security_t caller)
+int32_t psa_hash_setup_test(caller_security_t caller __UNUSED)
 {
     int                     num_checks = sizeof(check1)/sizeof(check1[0]);
     int32_t                 i, status;
diff --git a/api-tests/dev_apis/crypto/test_c012/test_c012.c b/api-tests/dev_apis/crypto/test_c012/test_c012.c
index d290702..8ddcf67 100644
--- a/api-tests/dev_apis/crypto/test_c012/test_c012.c
+++ b/api-tests/dev_apis/crypto/test_c012/test_c012.c
@@ -31,7 +31,7 @@
 
 static int g_test_count = 1;
 
-int32_t psa_hash_update_test(caller_security_t caller)
+int32_t psa_hash_update_test(caller_security_t caller __UNUSED)
 {
     int                     num_checks = sizeof(check1)/sizeof(check1[0]);
     int32_t                 i, status;
@@ -76,7 +76,7 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t psa_hash_update_invalid_handle(caller_security_t caller)
+int32_t psa_hash_update_invalid_handle(caller_security_t caller __UNUSED)
 {
     psa_hash_operation_t    operation;
     uint8_t                 input[] = "Hello World";
@@ -108,7 +108,7 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t psa_hash_update_with_completed_handle(caller_security_t caller)
+int32_t psa_hash_update_with_completed_handle(caller_security_t caller __UNUSED)
 {
     psa_hash_operation_t    operation;
     uint8_t                 input[] = {0xbd};
diff --git a/api-tests/dev_apis/crypto/test_c013/test_c013.c b/api-tests/dev_apis/crypto/test_c013/test_c013.c
index 6477465..97f0a40 100644
--- a/api-tests/dev_apis/crypto/test_c013/test_c013.c
+++ b/api-tests/dev_apis/crypto/test_c013/test_c013.c
@@ -30,7 +30,7 @@
 
 static int g_test_count = 1;
 
-int32_t psa_hash_verify_test(caller_security_t caller)
+int32_t psa_hash_verify_test(caller_security_t caller __UNUSED)
 {
     int                     num_checks = sizeof(check1)/sizeof(check1[0]);
     int32_t                 i, status;
@@ -86,7 +86,7 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t psa_hash_verify_inactive_operation_handle(caller_security_t caller)
+int32_t psa_hash_verify_inactive_operation_handle(caller_security_t caller __UNUSED)
 {
     psa_hash_operation_t    operation, invalid_operation;
     char                    input = 0xbd;
diff --git a/api-tests/dev_apis/crypto/test_c014/test_c014.c b/api-tests/dev_apis/crypto/test_c014/test_c014.c
index 796072b..73f8348 100644
--- a/api-tests/dev_apis/crypto/test_c014/test_c014.c
+++ b/api-tests/dev_apis/crypto/test_c014/test_c014.c
@@ -31,7 +31,7 @@
 
 static int g_test_count = 1;
 
-int32_t psa_hash_finish_test(caller_security_t caller)
+int32_t psa_hash_finish_test(caller_security_t caller __UNUSED)
 {
     int                     num_checks = sizeof(check1)/sizeof(check1[0]);
     int32_t                 i, status;
@@ -97,7 +97,7 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t psa_hash_finish_inactive_operation_handle(caller_security_t caller)
+int32_t psa_hash_finish_inactive_operation_handle(caller_security_t caller __UNUSED)
 {
     psa_hash_operation_t    operation;
     char                    input = 0xbd;
@@ -145,7 +145,7 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t psa_hash_finish_invalid_hash_buffer_size(caller_security_t caller)
+int32_t psa_hash_finish_invalid_hash_buffer_size(caller_security_t caller __UNUSED)
 {
     psa_hash_operation_t    operation;
     char                    input = 0xbd;
diff --git a/api-tests/dev_apis/crypto/test_c015/test_c015.c b/api-tests/dev_apis/crypto/test_c015/test_c015.c
index 21f736b..a7b1447 100644
--- a/api-tests/dev_apis/crypto/test_c015/test_c015.c
+++ b/api-tests/dev_apis/crypto/test_c015/test_c015.c
@@ -30,7 +30,7 @@
 
 static int g_test_count = 1;
 
-int32_t psa_hash_abort_test(caller_security_t caller)
+int32_t psa_hash_abort_test(caller_security_t caller __UNUSED)
 {
     int                     num_checks = sizeof(check1)/sizeof(check1[0]);
     int32_t                 i, status;
@@ -73,7 +73,7 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t psa_hash_abort_before_operation_finish(caller_security_t caller)
+int32_t psa_hash_abort_before_operation_finish(caller_security_t caller __UNUSED)
 {
     psa_hash_operation_t    operation;
     char                    input = 0xbd;
diff --git a/api-tests/dev_apis/crypto/test_c016/test_c016.c b/api-tests/dev_apis/crypto/test_c016/test_c016.c
index 347990e..265d8a1 100644
--- a/api-tests/dev_apis/crypto/test_c016/test_c016.c
+++ b/api-tests/dev_apis/crypto/test_c016/test_c016.c
@@ -30,7 +30,7 @@
 static int       g_test_count = 1;
 static uint8_t   data[BUFFER_SIZE];
 
-int32_t psa_generate_key_test(caller_security_t caller)
+int32_t psa_generate_key_test(caller_security_t caller __UNUSED)
 {
     int32_t               i, status;
     size_t                length;
diff --git a/api-tests/dev_apis/crypto/test_c017/test_c017.c b/api-tests/dev_apis/crypto/test_c017/test_c017.c
index 6fdcb48..1d413b8 100644
--- a/api-tests/dev_apis/crypto/test_c017/test_c017.c
+++ b/api-tests/dev_apis/crypto/test_c017/test_c017.c
@@ -30,10 +30,10 @@
 static int     g_test_count = 1;
 static uint8_t data[BUFFER_SIZE], changed[BUFFER_SIZE];
 
-int32_t psa_generate_random_test(caller_security_t caller)
+int32_t psa_generate_random_test(caller_security_t caller __UNUSED)
 {
-    int         num_checks = sizeof(check1)/sizeof(check1[0]);
-    uint32_t    i, j, run;
+    int         i, num_checks = sizeof(check1)/sizeof(check1[0]);
+    uint32_t    j, run;
     uint8_t     trail[] = "don't overwrite me";
     int32_t     status;
 
diff --git a/api-tests/dev_apis/crypto/test_c018/test_c018.c b/api-tests/dev_apis/crypto/test_c018/test_c018.c
index 5754495..e8679dc 100644
--- a/api-tests/dev_apis/crypto/test_c018/test_c018.c
+++ b/api-tests/dev_apis/crypto/test_c018/test_c018.c
@@ -30,7 +30,7 @@
 
 static int g_test_count = 1;
 
-int32_t psa_key_derivation_input_key_test(caller_security_t caller)
+int32_t psa_key_derivation_input_key_test(caller_security_t caller __UNUSED)
 {
     int32_t                        i, status;
     const uint8_t                 *key_data;
@@ -149,7 +149,7 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t psa_key_derivation_input_key_negative_test(caller_security_t caller)
+int32_t psa_key_derivation_input_key_negative_test(caller_security_t caller __UNUSED)
 {
     int32_t                        i, status;
     int                            num_checks = sizeof(check2)/sizeof(check2[0]);
diff --git a/api-tests/dev_apis/crypto/test_c019/test_c019.c b/api-tests/dev_apis/crypto/test_c019/test_c019.c
index f2dc24b..66cfa8d 100644
--- a/api-tests/dev_apis/crypto/test_c019/test_c019.c
+++ b/api-tests/dev_apis/crypto/test_c019/test_c019.c
@@ -29,7 +29,7 @@
 
 static int         g_test_count = 1;
 
-int32_t psa_key_derivation_key_agreement_test(caller_security_t caller)
+int32_t psa_key_derivation_key_agreement_test(caller_security_t caller __UNUSED)
 {
     int                             num_checks = sizeof(check1)/sizeof(check1[0]);
     int32_t                         i, status;
@@ -95,7 +95,7 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t psa_key_derivation_key_agreement_negative_test(caller_security_t caller)
+int32_t psa_key_derivation_key_agreement_negative_test(caller_security_t caller __UNUSED)
 {
     int32_t                         i, status;
     int                             num_checks = sizeof(check2)/sizeof(check2[0]);
diff --git a/api-tests/dev_apis/crypto/test_c020/test_c020.c b/api-tests/dev_apis/crypto/test_c020/test_c020.c
index b954fdb..166841a 100644
--- a/api-tests/dev_apis/crypto/test_c020/test_c020.c
+++ b/api-tests/dev_apis/crypto/test_c020/test_c020.c
@@ -30,9 +30,10 @@
 static int      g_test_count = 1;
 static uint8_t  output[BUFFER_SIZE];
 
-int32_t psa_key_derivation_output_bytes_test(caller_security_t caller)
+int32_t psa_key_derivation_output_bytes_test(caller_security_t caller __UNUSED)
 {
-    uint32_t                        i, status;
+    int32_t                         status;
+    int                             i;
     int                             num_checks = sizeof(check1)/sizeof(check1[0]);
     psa_key_attributes_t            attributes = PSA_KEY_ATTRIBUTES_INIT;
     psa_key_derivation_operation_t  operation = PSA_KEY_DERIVATION_OPERATION_INIT;
diff --git a/api-tests/dev_apis/crypto/test_c021/test_c021.c b/api-tests/dev_apis/crypto/test_c021/test_c021.c
index bcb9cc7..79ade63 100644
--- a/api-tests/dev_apis/crypto/test_c021/test_c021.c
+++ b/api-tests/dev_apis/crypto/test_c021/test_c021.c
@@ -32,9 +32,10 @@
 
 static int      g_test_count = 1;
 
-int32_t psa_key_derivation_output_key_test(caller_security_t caller)
+int32_t psa_key_derivation_output_key_test(caller_security_t caller __UNUSED)
 {
-    uint32_t                        i, status;
+    int32_t                         status;
+    int                             i;
     int                             num_checks = sizeof(check1)/sizeof(check1[0]);
     psa_key_handle_t                key_handle[2];
     psa_key_attributes_t            attributes = PSA_KEY_ATTRIBUTES_INIT;
diff --git a/api-tests/dev_apis/crypto/test_c022/test_c022.c b/api-tests/dev_apis/crypto/test_c022/test_c022.c
index 3c96266..cc57ee0 100644
--- a/api-tests/dev_apis/crypto/test_c022/test_c022.c
+++ b/api-tests/dev_apis/crypto/test_c022/test_c022.c
@@ -31,7 +31,7 @@
 static int         g_test_count = 1;
 static uint8_t     output[BUFFER_SIZE];
 
-int32_t psa_key_derivation_abort_test(caller_security_t caller)
+int32_t psa_key_derivation_abort_test(caller_security_t caller __UNUSED)
 {
     int32_t                         status;
     psa_key_derivation_operation_t  func = psa_key_derivation_operation_init();
diff --git a/api-tests/dev_apis/crypto/test_c023/test_c023.c b/api-tests/dev_apis/crypto/test_c023/test_c023.c
index 5fee88e..96a40fd 100644
--- a/api-tests/dev_apis/crypto/test_c023/test_c023.c
+++ b/api-tests/dev_apis/crypto/test_c023/test_c023.c
@@ -29,7 +29,7 @@
 
 static int g_test_count = 1;
 
-int32_t psa_key_derivation_set_get_capacity_test(caller_security_t caller)
+int32_t psa_key_derivation_set_get_capacity_test(caller_security_t caller __UNUSED)
 {
     int                     num_checks = sizeof(check1)/sizeof(check1[0]);
     int32_t                 i, status;
diff --git a/api-tests/dev_apis/crypto/test_c024/test_c024.c b/api-tests/dev_apis/crypto/test_c024/test_c024.c
index a487b4a..36f2436 100644
--- a/api-tests/dev_apis/crypto/test_c024/test_c024.c
+++ b/api-tests/dev_apis/crypto/test_c024/test_c024.c
@@ -32,7 +32,7 @@
 {
     int i;
 
-    for (i = 0; i < size; i++)
+    for (i = 0; i < (int)size; i++)
     {
         if (buffer[i] != 0)
             return FALSE;
@@ -41,9 +41,10 @@
     return TRUE;
 }
 
-int32_t psa_aead_encrypt_test(caller_security_t caller)
+int32_t psa_aead_encrypt_test(caller_security_t caller __UNUSED)
 {
-    int32_t               i, status;
+    int32_t               status;
+    int                   i;
     uint8_t               ciphertext[BUFFER_SIZE];
     size_t                ciphertext_length;
     int                   num_checks = sizeof(check1)/sizeof(check1[0]);
diff --git a/api-tests/dev_apis/crypto/test_c025/test_c025.c b/api-tests/dev_apis/crypto/test_c025/test_c025.c
index 8049b08..49c8369 100644
--- a/api-tests/dev_apis/crypto/test_c025/test_c025.c
+++ b/api-tests/dev_apis/crypto/test_c025/test_c025.c
@@ -32,7 +32,7 @@
 {
     int i;
 
-    for (i = 0; i < size; i++)
+    for (i = 0; i < (int)size; i++)
     {
         if (buffer[i] != 0)
             return FALSE;
@@ -41,7 +41,7 @@
     return TRUE;
 }
 
-int32_t psa_aead_decrypt_test(caller_security_t caller)
+int32_t psa_aead_decrypt_test(caller_security_t caller __UNUSED)
 {
     int32_t          i, status;
     uint8_t          plaintext[BUFFER_SIZE];
diff --git a/api-tests/dev_apis/crypto/test_c026/test_c026.c b/api-tests/dev_apis/crypto/test_c026/test_c026.c
index fd77f1b..22e10fb 100644
--- a/api-tests/dev_apis/crypto/test_c026/test_c026.c
+++ b/api-tests/dev_apis/crypto/test_c026/test_c026.c
@@ -30,7 +30,7 @@
 static int                 g_test_count = 1;
 static psa_mac_operation_t operation;
 
-int32_t psa_mac_sign_setup_test(caller_security_t caller)
+int32_t psa_mac_sign_setup_test(caller_security_t caller __UNUSED)
 {
     int                   num_checks = sizeof(check1)/sizeof(check1[0]);
     int32_t               i, status;
@@ -99,7 +99,7 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t psa_mac_sign_setup_negative_test(caller_security_t caller)
+int32_t psa_mac_sign_setup_negative_test(caller_security_t caller __UNUSED)
 {
     int                 num_checks = sizeof(check2)/sizeof(check2[0]);
     int32_t             i, status;
diff --git a/api-tests/dev_apis/crypto/test_c027/test_c027.c b/api-tests/dev_apis/crypto/test_c027/test_c027.c
index ca46ebc..1b8f0ce 100644
--- a/api-tests/dev_apis/crypto/test_c027/test_c027.c
+++ b/api-tests/dev_apis/crypto/test_c027/test_c027.c
@@ -30,7 +30,7 @@
 static int      g_test_count = 1;
 static uint8_t  data[BUFFER_SIZE];
 
-int32_t psa_mac_update_test(caller_security_t caller)
+int32_t psa_mac_update_test(caller_security_t caller __UNUSED)
 {
     int                   num_checks = sizeof(check1)/sizeof(check1[0]);
     int32_t               i, status;
@@ -115,11 +115,11 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t psa_mac_update_invalid_operator_test(caller_security_t caller)
+int32_t psa_mac_update_invalid_operator_test(caller_security_t caller __UNUSED)
 {
     int32_t             i, status;
     psa_mac_operation_t operation[] = {psa_mac_operation_init(), PSA_MAC_OPERATION_INIT, {0} };
-    uint32_t            operation_count = sizeof(operation)/sizeof(operation[0]);
+    int32_t             operation_count = sizeof(operation)/sizeof(operation[0]);
 
     memset(data, 0, sizeof(data));
     val->print(PRINT_TEST, "[Check %d] ", g_test_count++);
diff --git a/api-tests/dev_apis/crypto/test_c028/test_c028.c b/api-tests/dev_apis/crypto/test_c028/test_c028.c
index 83963c0..b0c0242 100644
--- a/api-tests/dev_apis/crypto/test_c028/test_c028.c
+++ b/api-tests/dev_apis/crypto/test_c028/test_c028.c
@@ -29,7 +29,7 @@
 static int           g_test_count = 1;
 static uint8_t       data[BUFFER_SIZE];
 
-int32_t psa_mac_sign_finish_test(caller_security_t caller)
+int32_t psa_mac_sign_finish_test(caller_security_t caller __UNUSED)
 {
     int                   num_checks = sizeof(check1)/sizeof(check1[0]);
     int32_t               i, status;
diff --git a/api-tests/dev_apis/crypto/test_c029/test_c029.c b/api-tests/dev_apis/crypto/test_c029/test_c029.c
index ce2e857..4496e85 100644
--- a/api-tests/dev_apis/crypto/test_c029/test_c029.c
+++ b/api-tests/dev_apis/crypto/test_c029/test_c029.c
@@ -30,7 +30,7 @@
 static int                 g_test_count = 1;
 static psa_mac_operation_t operation;
 
-int32_t psa_mac_verify_setup_test(caller_security_t caller)
+int32_t psa_mac_verify_setup_test(caller_security_t caller __UNUSED)
 {
     int                   num_checks = sizeof(check1)/sizeof(check1[0]);
     int32_t               i, status;
@@ -96,7 +96,7 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t psa_mac_verify_setup_negative_test(caller_security_t caller)
+int32_t psa_mac_verify_setup_negative_test(caller_security_t caller __UNUSED)
 {
     int                 num_checks = sizeof(check2)/sizeof(check2[0]);
     int32_t             i, status;
diff --git a/api-tests/dev_apis/crypto/test_c030/test_c030.c b/api-tests/dev_apis/crypto/test_c030/test_c030.c
index 723b9bf..3fe477d 100644
--- a/api-tests/dev_apis/crypto/test_c030/test_c030.c
+++ b/api-tests/dev_apis/crypto/test_c030/test_c030.c
@@ -28,7 +28,7 @@
 
 static int g_test_count = 1;
 
-int32_t psa_mac_verify_finish_test(caller_security_t caller)
+int32_t psa_mac_verify_finish_test(caller_security_t caller __UNUSED)
 {
     int                   num_checks = sizeof(check1)/sizeof(check1[0]);
     int32_t               i, status;
diff --git a/api-tests/dev_apis/crypto/test_c031/test_c031.c b/api-tests/dev_apis/crypto/test_c031/test_c031.c
index 8cd6a1d..b98ce82 100644
--- a/api-tests/dev_apis/crypto/test_c031/test_c031.c
+++ b/api-tests/dev_apis/crypto/test_c031/test_c031.c
@@ -30,7 +30,7 @@
 static int         g_test_count = 1;
 static uint8_t     data[BUFFER_SIZE];
 
-int32_t psa_mac_abort_test(caller_security_t caller)
+int32_t psa_mac_abort_test(caller_security_t caller __UNUSED)
 {
     int                   num_checks = sizeof(check1)/sizeof(check1[0]);
     int32_t               i, status;
@@ -89,7 +89,7 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t psa_mac_abort_before_finish_test(caller_security_t caller)
+int32_t psa_mac_abort_before_finish_test(caller_security_t caller __UNUSED)
 {
     size_t                length;
     psa_algorithm_t       key_alg = PSA_ALG_CMAC;
diff --git a/api-tests/dev_apis/crypto/test_c032/test_c032.c b/api-tests/dev_apis/crypto/test_c032/test_c032.c
index d1093fc..fdd7249 100644
--- a/api-tests/dev_apis/crypto/test_c032/test_c032.c
+++ b/api-tests/dev_apis/crypto/test_c032/test_c032.c
@@ -30,7 +30,7 @@
 static int                     g_test_count = 1;
 static psa_cipher_operation_t  operation;
 
-int32_t psa_cipher_encrypt_setup_test(caller_security_t caller)
+int32_t psa_cipher_encrypt_setup_test(caller_security_t caller __UNUSED)
 {
     int                     num_checks = sizeof(check1)/sizeof(check1[0]);
     int32_t                 i, status;
@@ -132,7 +132,7 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t psa_cipher_encrypt_setup_negative_test(caller_security_t caller)
+int32_t psa_cipher_encrypt_setup_negative_test(caller_security_t caller __UNUSED)
 {
     int                     num_checks = sizeof(check2)/sizeof(check2[0]);
     int32_t                 i, status;
diff --git a/api-tests/dev_apis/crypto/test_c033/test_c033.c b/api-tests/dev_apis/crypto/test_c033/test_c033.c
index 2ec5d43..3462afb 100644
--- a/api-tests/dev_apis/crypto/test_c033/test_c033.c
+++ b/api-tests/dev_apis/crypto/test_c033/test_c033.c
@@ -30,7 +30,7 @@
 static int                     g_test_count = 1;
 static psa_cipher_operation_t  operation;
 
-int32_t psa_cipher_decrypt_setup_test(caller_security_t caller)
+int32_t psa_cipher_decrypt_setup_test(caller_security_t caller __UNUSED)
 {
     int                     num_checks = sizeof(check1)/sizeof(check1[0]);
     int32_t                 i, status;
@@ -132,7 +132,7 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t psa_cipher_decrypt_setup_negative_test(caller_security_t caller)
+int32_t psa_cipher_decrypt_setup_negative_test(caller_security_t caller __UNUSED)
 {
     int                     num_checks = sizeof(check2)/sizeof(check2[0]);
     int32_t                 i, status;
diff --git a/api-tests/dev_apis/crypto/test_c034/test_c034.c b/api-tests/dev_apis/crypto/test_c034/test_c034.c
index 6a77a21..9c7885f 100644
--- a/api-tests/dev_apis/crypto/test_c034/test_c034.c
+++ b/api-tests/dev_apis/crypto/test_c034/test_c034.c
@@ -29,10 +29,10 @@
 
 static int     g_test_count = 1;
 
-int32_t psa_cipher_generate_iv_test(caller_security_t caller)
+int32_t psa_cipher_generate_iv_test(caller_security_t caller __UNUSED)
 {
-    int                     num_checks = sizeof(check1)/sizeof(check1[0]);
-    uint32_t                i, j, iv_sum;
+    int                     i, num_checks = sizeof(check1)/sizeof(check1[0]);
+    uint32_t                j, iv_sum;
     uint8_t                 iv[32];
     size_t                  iv_length;
     psa_cipher_operation_t  operation;
diff --git a/api-tests/dev_apis/crypto/test_c035/test_c035.c b/api-tests/dev_apis/crypto/test_c035/test_c035.c
index 887ca14..2fd4f35 100644
--- a/api-tests/dev_apis/crypto/test_c035/test_c035.c
+++ b/api-tests/dev_apis/crypto/test_c035/test_c035.c
@@ -29,7 +29,7 @@
 
 static int     g_test_count = 1;
 
-int32_t psa_cipher_set_iv_test(caller_security_t caller)
+int32_t psa_cipher_set_iv_test(caller_security_t caller __UNUSED)
 {
     int                     num_checks = sizeof(check1)/sizeof(check1[0]);
     int32_t                 i, status;
diff --git a/api-tests/dev_apis/crypto/test_c036/test_c036.c b/api-tests/dev_apis/crypto/test_c036/test_c036.c
index 0744ed1..9ce3ad1 100644
--- a/api-tests/dev_apis/crypto/test_c036/test_c036.c
+++ b/api-tests/dev_apis/crypto/test_c036/test_c036.c
@@ -32,7 +32,7 @@
 static uint8_t                 input[SIZE_32B];
 static uint8_t                 output[SIZE_32B];
 
-int32_t psa_cipher_update_test(caller_security_t caller)
+int32_t psa_cipher_update_test(caller_security_t caller __UNUSED)
 {
     int                     num_checks = sizeof(check1)/sizeof(check1[0]);
     int32_t                 i, status;
@@ -128,12 +128,12 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t psa_cipher_update_negative_test(caller_security_t caller)
+int32_t psa_cipher_update_negative_test(caller_security_t caller __UNUSED)
 {
     int32_t                 i, status;
     psa_cipher_operation_t  operations[] = {psa_cipher_operation_init(),
                                             PSA_CIPHER_OPERATION_INIT, {0} };
-    uint32_t                operation_count = sizeof(operations)/sizeof(operations[0]);
+    int32_t                 operation_count = sizeof(operations)/sizeof(operations[0]);
     size_t                  length;
 
     memset(output, 0, sizeof(output));
diff --git a/api-tests/dev_apis/crypto/test_c037/test_c037.c b/api-tests/dev_apis/crypto/test_c037/test_c037.c
index 665047f..9b31c24 100644
--- a/api-tests/dev_apis/crypto/test_c037/test_c037.c
+++ b/api-tests/dev_apis/crypto/test_c037/test_c037.c
@@ -32,7 +32,7 @@
 static int        g_test_count = 1;
 static uint8_t    output[SIZE_32B];
 
-int32_t psa_cipher_finish_test(caller_security_t caller)
+int32_t psa_cipher_finish_test(caller_security_t caller __UNUSED)
 {
     int                     num_checks = sizeof(check1)/sizeof(check1[0]);
     int32_t                 i, status;
diff --git a/api-tests/dev_apis/crypto/test_c038/test_c038.c b/api-tests/dev_apis/crypto/test_c038/test_c038.c
index 7f80eda..792c52d 100644
--- a/api-tests/dev_apis/crypto/test_c038/test_c038.c
+++ b/api-tests/dev_apis/crypto/test_c038/test_c038.c
@@ -30,7 +30,7 @@
 static int         g_test_count = 1;
 static uint8_t     output[SIZE_32B];
 
-int32_t psa_cipher_abort_test(caller_security_t caller)
+int32_t psa_cipher_abort_test(caller_security_t caller __UNUSED)
 {
     int                     num_checks = sizeof(check1)/sizeof(check1[0]);
     int32_t                 i, status;
@@ -102,7 +102,7 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t psa_cipher_abort_before_update_test(caller_security_t caller)
+int32_t psa_cipher_abort_before_update_test(caller_security_t caller __UNUSED)
 {
     size_t                  length;
     psa_algorithm_t         key_alg = PSA_ALG_CBC_NO_PADDING;
diff --git a/api-tests/dev_apis/crypto/test_c039/test_c039.c b/api-tests/dev_apis/crypto/test_c039/test_c039.c
index 1df1f76..24a989a 100644
--- a/api-tests/dev_apis/crypto/test_c039/test_c039.c
+++ b/api-tests/dev_apis/crypto/test_c039/test_c039.c
@@ -31,7 +31,7 @@
 {
     int i;
 
-    for (i = 0; i < size; i++)
+    for (i = 0; i < (int)size; i++)
     {
         if (buffer[i] != 0)
             return FALSE;
@@ -43,7 +43,7 @@
 static int         g_test_count = 1;
 static uint8_t     output[SIZE_128B];
 
-int32_t psa_asymmetric_encrypt_test(caller_security_t caller)
+int32_t psa_asymmetric_encrypt_test(caller_security_t caller __UNUSED)
 {
     int                     num_checks = sizeof(check1)/sizeof(check1[0]);
     int32_t                 i, status;
@@ -174,7 +174,7 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t psa_asymmetric_encrypt_negative_test(caller_security_t caller)
+int32_t psa_asymmetric_encrypt_negative_test(caller_security_t caller __UNUSED)
 {
     int                     num_checks = sizeof(check2)/sizeof(check2[0]);
     int32_t                 i, status;
diff --git a/api-tests/dev_apis/crypto/test_c040/test_c040.c b/api-tests/dev_apis/crypto/test_c040/test_c040.c
index 93d242e..ae9b91e 100644
--- a/api-tests/dev_apis/crypto/test_c040/test_c040.c
+++ b/api-tests/dev_apis/crypto/test_c040/test_c040.c
@@ -31,7 +31,7 @@
 {
     int i;
 
-    for (i = 0; i < size; i++)
+    for (i = 0; i < (int)size; i++)
     {
         if (buffer[i] != 0)
             return FALSE;
@@ -43,7 +43,7 @@
 static int         g_test_count = 1;
 static uint8_t     output[SIZE_128B];
 
-int32_t psa_asymmetric_decrypt_test(caller_security_t caller)
+int32_t psa_asymmetric_decrypt_test(caller_security_t caller __UNUSED)
 {
     int                     num_checks = sizeof(check1)/sizeof(check1[0]);
     int32_t                 i, status;
@@ -160,7 +160,7 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t psa_asymmetric_decrypt_negative_test(caller_security_t caller)
+int32_t psa_asymmetric_decrypt_negative_test(caller_security_t caller __UNUSED)
 {
     int                     num_checks = sizeof(check2)/sizeof(check2[0]);
     int32_t                 i, status;
diff --git a/api-tests/dev_apis/crypto/test_c041/test_c041.c b/api-tests/dev_apis/crypto/test_c041/test_c041.c
index c7cf836..7691bf3 100644
--- a/api-tests/dev_apis/crypto/test_c041/test_c041.c
+++ b/api-tests/dev_apis/crypto/test_c041/test_c041.c
@@ -30,7 +30,7 @@
 static int         g_test_count = 1;
 static uint8_t     signature[SIZE_128B];
 
-int32_t psa_asymmetric_sign_test(caller_security_t caller)
+int32_t psa_asymmetric_sign_test(caller_security_t caller __UNUSED)
 {
     int                     num_checks = sizeof(check1)/sizeof(check1[0]);
     int32_t                 i, status;
@@ -134,7 +134,7 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t psa_asymmetric_sign_negative_test(caller_security_t caller)
+int32_t psa_asymmetric_sign_negative_test(caller_security_t caller __UNUSED)
 {
     int                     num_checks = sizeof(check2)/sizeof(check2[0]);
     int32_t                 i, status;
diff --git a/api-tests/dev_apis/crypto/test_c042/test_c042.c b/api-tests/dev_apis/crypto/test_c042/test_c042.c
index f257c82..eae93d4 100644
--- a/api-tests/dev_apis/crypto/test_c042/test_c042.c
+++ b/api-tests/dev_apis/crypto/test_c042/test_c042.c
@@ -29,7 +29,7 @@
 
 static int     g_test_count = 1;
 
-int32_t psa_asymmetric_verify_test(caller_security_t caller)
+int32_t psa_asymmetric_verify_test(caller_security_t caller __UNUSED)
 {
     int                     num_checks = sizeof(check1)/sizeof(check1[0]);
     int32_t                 i, status;
@@ -116,7 +116,7 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t psa_asymmetric_verify_negative_test(caller_security_t caller)
+int32_t psa_asymmetric_verify_negative_test(caller_security_t caller __UNUSED)
 {
     int                     num_checks = sizeof(check2)/sizeof(check2[0]);
     int32_t                 i, status;
diff --git a/api-tests/dev_apis/crypto/test_c043/test_c043.c b/api-tests/dev_apis/crypto/test_c043/test_c043.c
index d048364..8f1c4ea 100644
--- a/api-tests/dev_apis/crypto/test_c043/test_c043.c
+++ b/api-tests/dev_apis/crypto/test_c043/test_c043.c
@@ -30,7 +30,7 @@
 static int         g_test_count = 1;
 static uint8_t     output[SIZE_50B];
 
-int32_t psa_raw_key_agreement_test(caller_security_t caller)
+int32_t psa_raw_key_agreement_test(caller_security_t caller __UNUSED)
 {
     int                     num_checks = sizeof(check1)/sizeof(check1[0]);
     int32_t                 i, status;
@@ -93,7 +93,7 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t psa_raw_key_agreement_negative_test(caller_security_t caller)
+int32_t psa_raw_key_agreement_negative_test(caller_security_t caller __UNUSED)
 {
     int                     num_checks = sizeof(check2)/sizeof(check2[0]);
     int32_t                 i, status;
diff --git a/api-tests/dev_apis/crypto/test_c044/test_c044.c b/api-tests/dev_apis/crypto/test_c044/test_c044.c
index f2a085b..7b5bc77 100644
--- a/api-tests/dev_apis/crypto/test_c044/test_c044.c
+++ b/api-tests/dev_apis/crypto/test_c044/test_c044.c
@@ -30,16 +30,16 @@
 static int g_test_count = 1;
 static uint8_t data[BUFFER_SIZE];
 
-int32_t psa_copy_key_test(caller_security_t caller)
+int32_t psa_copy_key_test(caller_security_t caller __UNUSED)
 {
-    uint32_t              length, i;
+    uint32_t              length;
     const uint8_t        *key_data;
     psa_key_handle_t      target_handle = 0;
     psa_key_usage_t       get_key_usage_flags;
     psa_algorithm_t       get_key_algorithm;
     size_t                get_key_bits;
     psa_key_type_t        get_key_type;
-    int                   num_checks = sizeof(check1)/sizeof(check1[0]);
+    int                   i, num_checks = sizeof(check1)/sizeof(check1[0]);
     int32_t               status, export_status;
     psa_key_attributes_t  source_attributes = PSA_KEY_ATTRIBUTES_INIT;
     psa_key_attributes_t  target_attributes = PSA_KEY_ATTRIBUTES_INIT;
diff --git a/api-tests/dev_apis/crypto/test_c045/test_c045.c b/api-tests/dev_apis/crypto/test_c045/test_c045.c
index c03ab4e..3cb17cd 100644
--- a/api-tests/dev_apis/crypto/test_c045/test_c045.c
+++ b/api-tests/dev_apis/crypto/test_c045/test_c045.c
@@ -29,7 +29,7 @@
 
 static int g_test_count = 1;
 
-int32_t psa_hash_clone_test(caller_security_t caller)
+int32_t psa_hash_clone_test(caller_security_t caller __UNUSED)
 {
     int                     num_checks = sizeof(check1)/sizeof(check1[0]);
     int32_t                 i, status;
diff --git a/api-tests/dev_apis/crypto/test_c046/test_c046.c b/api-tests/dev_apis/crypto/test_c046/test_c046.c
index 6f08f80..3b7bd52 100644
--- a/api-tests/dev_apis/crypto/test_c046/test_c046.c
+++ b/api-tests/dev_apis/crypto/test_c046/test_c046.c
@@ -29,7 +29,7 @@
 static int           g_test_count = 1;
 static uint8_t       data[BUFFER_SIZE];
 
-int32_t psa_mac_compute_test(caller_security_t caller)
+int32_t psa_mac_compute_test(caller_security_t caller __UNUSED)
 {
     int                   num_checks = sizeof(check1)/sizeof(check1[0]);
     int32_t               i, status;
diff --git a/api-tests/dev_apis/crypto/test_c047/test_c047.c b/api-tests/dev_apis/crypto/test_c047/test_c047.c
index 55f8d6b..99a4894 100644
--- a/api-tests/dev_apis/crypto/test_c047/test_c047.c
+++ b/api-tests/dev_apis/crypto/test_c047/test_c047.c
@@ -28,7 +28,7 @@
 
 static int g_test_count = 1;
 
-int32_t psa_mac_verify_test(caller_security_t caller)
+int32_t psa_mac_verify_test(caller_security_t caller __UNUSED)
 {
     int                   num_checks = sizeof(check1)/sizeof(check1[0]);
     int32_t               i, status;
diff --git a/api-tests/dev_apis/crypto/test_c048/test_c048.c b/api-tests/dev_apis/crypto/test_c048/test_c048.c
index d791fd0..7cb5fb7 100644
--- a/api-tests/dev_apis/crypto/test_c048/test_c048.c
+++ b/api-tests/dev_apis/crypto/test_c048/test_c048.c
@@ -29,7 +29,7 @@
 static int        g_test_count = 1;
 static uint8_t    output[SIZE_32B];
 
-int32_t psa_cipher_encrypt_test(caller_security_t caller)
+int32_t psa_cipher_encrypt_test(caller_security_t caller __UNUSED)
 {
     int                     num_checks = sizeof(check1)/sizeof(check1[0]);
     int32_t                 i, status;
diff --git a/api-tests/dev_apis/crypto/test_c049/test_c049.c b/api-tests/dev_apis/crypto/test_c049/test_c049.c
index de53362..1c3abeb 100644
--- a/api-tests/dev_apis/crypto/test_c049/test_c049.c
+++ b/api-tests/dev_apis/crypto/test_c049/test_c049.c
@@ -29,7 +29,7 @@
 static int        g_test_count = 1;
 static uint8_t    output[SIZE_32B];
 
-int32_t psa_cipher_decrypt_test(caller_security_t caller)
+int32_t psa_cipher_decrypt_test(caller_security_t caller __UNUSED)
 {
     int                     num_checks = sizeof(check1)/sizeof(check1[0]);
     int32_t                 i, status;
diff --git a/api-tests/dev_apis/crypto/test_c050/test_c050.c b/api-tests/dev_apis/crypto/test_c050/test_c050.c
index a7cf51e..2ee22da 100644
--- a/api-tests/dev_apis/crypto/test_c050/test_c050.c
+++ b/api-tests/dev_apis/crypto/test_c050/test_c050.c
@@ -30,7 +30,7 @@
 static int      g_test_count = 1;
 static uint8_t  data[BUFFER_SIZE];
 
-int32_t psa_open_key_test(caller_security_t caller)
+int32_t psa_open_key_test(caller_security_t caller __UNUSED)
 {
     int32_t               status, i = 0;
     size_t                length, get_key_bits;
diff --git a/api-tests/dev_apis/crypto/test_c051/test_c051.c b/api-tests/dev_apis/crypto/test_c051/test_c051.c
index f2403e4..f50076a 100644
--- a/api-tests/dev_apis/crypto/test_c051/test_c051.c
+++ b/api-tests/dev_apis/crypto/test_c051/test_c051.c
@@ -28,7 +28,7 @@
 
 static int g_test_count = 1;
 
-int32_t psa_close_key_test(caller_security_t caller)
+int32_t psa_close_key_test(caller_security_t caller __UNUSED)
 {
     int32_t               i, status;
     const uint8_t        *key_data;
diff --git a/api-tests/dev_apis/crypto/test_c052/test_c052.c b/api-tests/dev_apis/crypto/test_c052/test_c052.c
index 8e4dffc..bdb16da 100644
--- a/api-tests/dev_apis/crypto/test_c052/test_c052.c
+++ b/api-tests/dev_apis/crypto/test_c052/test_c052.c
@@ -28,7 +28,7 @@
 
 static int g_test_count = 1;
 
-int32_t psa_aead_encrypt_setup_test(caller_security_t caller)
+int32_t psa_aead_encrypt_setup_test(caller_security_t caller __UNUSED)
 {
     int32_t               i, status;
     int                   num_checks = sizeof(check1)/sizeof(check1[0]);
diff --git a/api-tests/dev_apis/crypto/test_c053/test_c053.c b/api-tests/dev_apis/crypto/test_c053/test_c053.c
index b70afb5..153442e 100644
--- a/api-tests/dev_apis/crypto/test_c053/test_c053.c
+++ b/api-tests/dev_apis/crypto/test_c053/test_c053.c
@@ -28,7 +28,7 @@
 
 static int g_test_count = 1;
 
-int32_t psa_aead_decrypt_setup_test(caller_security_t caller)
+int32_t psa_aead_decrypt_setup_test(caller_security_t caller __UNUSED)
 {
     int32_t               i, status;
     int                   num_checks = sizeof(check1)/sizeof(check1[0]);
diff --git a/api-tests/dev_apis/crypto/test_c054/test_c054.c b/api-tests/dev_apis/crypto/test_c054/test_c054.c
index 6271299..928c112 100644
--- a/api-tests/dev_apis/crypto/test_c054/test_c054.c
+++ b/api-tests/dev_apis/crypto/test_c054/test_c054.c
@@ -28,7 +28,7 @@
 
 static int g_test_count = 1;
 
-int32_t psa_aead_generate_nonce_test(caller_security_t caller)
+int32_t psa_aead_generate_nonce_test(caller_security_t caller __UNUSED)
 {
     int32_t               i, j, status, nonce_sum;
     uint8_t               nonce[SIZE_32B];
@@ -94,10 +94,8 @@
 
         /* Check that if generated iv are non-zero */
         nonce_sum = 0;
-        for (j = 0; j < nonce_length; j++)
-        {
+        for (j = 0; j < (int)nonce_length; j++)
             nonce_sum += nonce[j];
-        }
 
         TEST_ASSERT_NOT_EQUAL(nonce_sum, 0, TEST_CHECKPOINT_NUM(8));
 
diff --git a/api-tests/dev_apis/crypto/test_c055/test_c055.c b/api-tests/dev_apis/crypto/test_c055/test_c055.c
index 0433e16..3494a1e 100644
--- a/api-tests/dev_apis/crypto/test_c055/test_c055.c
+++ b/api-tests/dev_apis/crypto/test_c055/test_c055.c
@@ -28,7 +28,7 @@
 
 static int g_test_count = 1;
 
-int32_t psa_aead_set_nonce_test(caller_security_t caller)
+int32_t psa_aead_set_nonce_test(caller_security_t caller __UNUSED)
 {
     int32_t               i, status;
     int                   num_checks = sizeof(check1)/sizeof(check1[0]);
diff --git a/api-tests/dev_apis/crypto/test_c056/test_c056.c b/api-tests/dev_apis/crypto/test_c056/test_c056.c
index 6585851..a740e59 100644
--- a/api-tests/dev_apis/crypto/test_c056/test_c056.c
+++ b/api-tests/dev_apis/crypto/test_c056/test_c056.c
@@ -28,7 +28,7 @@
 
 static int g_test_count = 1;
 
-int32_t psa_aead_set_lengths_test(caller_security_t caller)
+int32_t psa_aead_set_lengths_test(caller_security_t caller __UNUSED)
 {
     int32_t               i, status;
     int                   num_checks = sizeof(check1)/sizeof(check1[0]);
diff --git a/api-tests/dev_apis/crypto/test_c057/test_c057.c b/api-tests/dev_apis/crypto/test_c057/test_c057.c
index ce0745c..5eea36c 100644
--- a/api-tests/dev_apis/crypto/test_c057/test_c057.c
+++ b/api-tests/dev_apis/crypto/test_c057/test_c057.c
@@ -28,7 +28,7 @@
 
 static int g_test_count = 1;
 
-int32_t psa_aead_update_ad_test(caller_security_t caller)
+int32_t psa_aead_update_ad_test(caller_security_t caller __UNUSED)
 {
     int32_t               i, status;
     int                   num_checks = sizeof(check1)/sizeof(check1[0]);
diff --git a/api-tests/dev_apis/crypto/test_c058/test_c058.c b/api-tests/dev_apis/crypto/test_c058/test_c058.c
index 980d2e7..db9b17b 100644
--- a/api-tests/dev_apis/crypto/test_c058/test_c058.c
+++ b/api-tests/dev_apis/crypto/test_c058/test_c058.c
@@ -28,7 +28,7 @@
 
 static int g_test_count = 1;
 
-int32_t psa_aead_update_test(caller_security_t caller)
+int32_t psa_aead_update_test(caller_security_t caller __UNUSED)
 {
     int32_t               i, status;
     uint8_t               output[BUFFER_SIZE];
diff --git a/api-tests/dev_apis/crypto/test_c059/test_c059.c b/api-tests/dev_apis/crypto/test_c059/test_c059.c
index 7fbd6e1..ff127a0 100644
--- a/api-tests/dev_apis/crypto/test_c059/test_c059.c
+++ b/api-tests/dev_apis/crypto/test_c059/test_c059.c
@@ -29,7 +29,7 @@
 static int      g_test_count = 1;
 static uint8_t  output[BUFFER_SIZE], tag[SIZE_128B];
 
-int32_t psa_aead_finish_test(caller_security_t caller)
+int32_t psa_aead_finish_test(caller_security_t caller __UNUSED)
 {
     int32_t               i, status;
     size_t                length,  tag_length;
diff --git a/api-tests/dev_apis/crypto/test_c060/test_c060.c b/api-tests/dev_apis/crypto/test_c060/test_c060.c
index 44739ec..6d6a80f 100644
--- a/api-tests/dev_apis/crypto/test_c060/test_c060.c
+++ b/api-tests/dev_apis/crypto/test_c060/test_c060.c
@@ -29,7 +29,7 @@
 
 static int g_test_count = 1;
 
-int32_t psa_aead_abort_test(caller_security_t caller)
+int32_t psa_aead_abort_test(caller_security_t caller __UNUSED)
 {
     int32_t               i, status;
     int                   num_checks = sizeof(check1)/sizeof(check1[0]);
@@ -86,11 +86,11 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t psa_aead_abort_init_test(caller_security_t caller)
+int32_t psa_aead_abort_init_test(caller_security_t caller __UNUSED)
 {
     int32_t               i, status;
     psa_aead_operation_t  operation[] = {PSA_AEAD_OPERATION_INIT, psa_aead_operation_init(), {0} };
-    uint32_t              operation_count = sizeof(operation)/sizeof(operation[0]);
+    int32_t               operation_count = sizeof(operation)/sizeof(operation[0]);
 
     /* Initialize the PSA crypto library*/
     status = val->crypto_function(VAL_CRYPTO_INIT);
diff --git a/api-tests/dev_apis/crypto/test_c061/test_c061.c b/api-tests/dev_apis/crypto/test_c061/test_c061.c
index cc19d7a..c3cd9e5 100644
--- a/api-tests/dev_apis/crypto/test_c061/test_c061.c
+++ b/api-tests/dev_apis/crypto/test_c061/test_c061.c
@@ -29,7 +29,7 @@
 static int      g_test_count = 1;
 static uint8_t  output[BUFFER_SIZE], tag[SIZE_128B];
 
-int32_t psa_aead_verify_test(caller_security_t caller)
+int32_t psa_aead_verify_test(caller_security_t caller __UNUSED)
 {
     int32_t               i, status;
     size_t                length;
diff --git a/api-tests/dev_apis/initial_attestation/test_a001/test_a001.c b/api-tests/dev_apis/initial_attestation/test_a001/test_a001.c
index 3a2251a..601115f 100644
--- a/api-tests/dev_apis/initial_attestation/test_a001/test_a001.c
+++ b/api-tests/dev_apis/initial_attestation/test_a001/test_a001.c
@@ -29,10 +29,9 @@
 
 static int         g_test_count = 1;
 
-int32_t psa_initial_attestation_get_token_test(caller_security_t caller)
+int32_t psa_initial_attestation_get_token_test(caller_security_t caller __UNUSED)
 {
-    int         num_checks = sizeof(check1)/sizeof(check1[0]);
-    uint32_t    i;
+    int         i, num_checks = sizeof(check1)/sizeof(check1[0]);
     int32_t     status;
     size_t      token_buffer_size, token_size;
     uint8_t     challenge[PSA_INITIAL_ATTEST_CHALLENGE_SIZE_64+1];
@@ -83,10 +82,9 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t psa_initial_attestation_get_token_size_test(caller_security_t caller)
+int32_t psa_initial_attestation_get_token_size_test(caller_security_t caller __UNUSED)
 {
-    int         num_checks = sizeof(check2)/sizeof(check2[0]);
-    uint32_t    i;
+    int         i, num_checks = sizeof(check2)/sizeof(check2[0]);
     int32_t     status;
     size_t      token_size;
 
diff --git a/api-tests/dev_apis/storage/test_s001/test_s001.c b/api-tests/dev_apis/storage/test_s001/test_s001.c
index 02eada3..d4cf5d5 100644
--- a/api-tests/dev_apis/storage/test_s001/test_s001.c
+++ b/api-tests/dev_apis/storage/test_s001/test_s001.c
@@ -40,18 +40,20 @@
     size_t  p_data_length = 0;
 
     /* get() without using set() before */
-    val->print(PRINT_TEST, "[Check 1] Call get API for UID %d which is not set\n", p_uid);
+    val->print(PRINT_TEST, "[Check 1] Call get API for UID %d which is not set\n", (int32_t)p_uid);
     status = STORAGE_FUNCTION(s001_data[VAL_TEST_IDX1].api[fCode], p_uid, 0, TEST_BUFF_SIZE,
                               read_buff, &p_data_length);
     TEST_ASSERT_EQUAL(status, s001_data[VAL_TEST_IDX1].status, TEST_CHECKPOINT_NUM(1));
 
     /*  get_info() without using set() before */
-    val->print(PRINT_TEST, "[Check 2] Call get_info API for UID %d which is not set\n", p_uid);
+    val->print(PRINT_TEST, "[Check 2] Call get_info API for UID %d which is not set\n",
+                            (int32_t)p_uid);
     status = STORAGE_FUNCTION(s001_data[VAL_TEST_IDX2].api[fCode], p_uid, &info);
     TEST_ASSERT_EQUAL(status, s001_data[VAL_TEST_IDX2].status, TEST_CHECKPOINT_NUM(2));
 
     /* remove() without using set() before */
-    val->print(PRINT_TEST, "[Check 3] Call remove API for UID %d which is not set\n", p_uid);
+    val->print(PRINT_TEST, "[Check 3] Call remove API for UID %d which is not set\n",
+                            (int32_t)p_uid);
     status = STORAGE_FUNCTION(s001_data[VAL_TEST_IDX3].api[fCode], p_uid);
     TEST_ASSERT_EQUAL(status, s001_data[VAL_TEST_IDX3].status, TEST_CHECKPOINT_NUM(3));
 
@@ -85,18 +87,20 @@
     size_t  p_data_length = 0;
 
     /* get() for UID which is removed */
-    val->print(PRINT_TEST, "[Check 4] Call get API for UID %d which is removed\n", p_uid);
+    val->print(PRINT_TEST, "[Check 4] Call get API for UID %d which is removed\n", (int32_t)p_uid);
     status = STORAGE_FUNCTION(s001_data[VAL_TEST_IDX7].api[fCode], p_uid, 0, TEST_BUFF_SIZE,
                               read_buff, &p_data_length);
     TEST_ASSERT_EQUAL(status, s001_data[VAL_TEST_IDX7].status, TEST_CHECKPOINT_NUM(7));
 
     /* get_info() for UID which is removed */
-    val->print(PRINT_TEST, "[Check 5] Call get_info API for UID %d which is removed\n", p_uid);
+    val->print(PRINT_TEST, "[Check 5] Call get_info API for UID %d which is removed\n",
+                            (int32_t)p_uid);
     status = STORAGE_FUNCTION(s001_data[VAL_TEST_IDX8].api[fCode], p_uid, &info);
     TEST_ASSERT_EQUAL(status, s001_data[VAL_TEST_IDX8].status, TEST_CHECKPOINT_NUM(8));
 
     /* remove() for UID which is removed */
-    val->print(PRINT_TEST, "[Check 6] Call remove API for UID %d which is removed\n", p_uid);
+    val->print(PRINT_TEST, "[Check 6] Call remove API for UID %d which is removed\n",
+                            (int32_t)p_uid);
     status = STORAGE_FUNCTION(s001_data[VAL_TEST_IDX9].api[fCode], p_uid);
     TEST_ASSERT_EQUAL(status, s001_data[VAL_TEST_IDX9].status, TEST_CHECKPOINT_NUM(9));
 
@@ -109,24 +113,25 @@
     size_t  p_data_length = 0;
 
     /* set() a UID */
-    val->print(PRINT_TEST, "Set storage for UID %d\n", p_uid);
+    val->print(PRINT_TEST, "Set storage for UID %d\n", (int32_t)p_uid);
     status = STORAGE_FUNCTION(s001_data[VAL_TEST_IDX10].api[fCode], p_uid, TEST_BUFF_SIZE,
                               write_buff, PSA_STORAGE_FLAG_NONE);
     TEST_ASSERT_EQUAL(status, s001_data[VAL_TEST_IDX10].status, TEST_CHECKPOINT_NUM(10));
 
     /* get() for different UID then set UID */
-    val->print(PRINT_TEST, "[Check 7] Call get API for different UID %d\n", p_uid-1);
+    val->print(PRINT_TEST, "[Check 7] Call get API for different UID %d\n", (int32_t)(p_uid-1));
     status = STORAGE_FUNCTION(s001_data[VAL_TEST_IDX11].api[fCode], p_uid-1, 0, TEST_BUFF_SIZE - 1,
                               read_buff, &p_data_length);
     TEST_ASSERT_EQUAL(status, s001_data[VAL_TEST_IDX11].status, TEST_CHECKPOINT_NUM(11));
 
     /* get_info() for different UID then set UID */
-    val->print(PRINT_TEST, "[Check 8] Call get_info API for different UID %d\n", p_uid-1);
+    val->print(PRINT_TEST, "[Check 8] Call get_info API for different UID %d\n",
+                            (int32_t)(p_uid-1));
     status = STORAGE_FUNCTION(s001_data[VAL_TEST_IDX12].api[fCode], p_uid-1, &info);
     TEST_ASSERT_EQUAL(status, s001_data[VAL_TEST_IDX12].status, TEST_CHECKPOINT_NUM(12));
 
     /* remove() for different UID then set UID */
-    val->print(PRINT_TEST, "[Check 9] Call remove API for different UID %d\n", p_uid-1);
+    val->print(PRINT_TEST, "[Check 9] Call remove API for different UID %d\n", (int32_t)(p_uid-1));
     status = STORAGE_FUNCTION(s001_data[VAL_TEST_IDX13].api[fCode], p_uid-1);
     TEST_ASSERT_EQUAL(status, s001_data[VAL_TEST_IDX13].status, TEST_CHECKPOINT_NUM(13));
 
@@ -175,7 +180,7 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t s001_storage_test(caller_security_t caller)
+int32_t s001_storage_test(caller_security_t caller __UNUSED)
 {
     int32_t status;
 
diff --git a/api-tests/dev_apis/storage/test_s002/test_s002.c b/api-tests/dev_apis/storage/test_s002/test_s002.c
index 06cfb22..dce0169 100644
--- a/api-tests/dev_apis/storage/test_s002/test_s002.c
+++ b/api-tests/dev_apis/storage/test_s002/test_s002.c
@@ -46,8 +46,9 @@
     if (status == PSA_ERROR_NOT_PERMITTED)
     {
         val->print(PRINT_TEST, "[Info] UID %d was created with PSA_STORAGE_FLAG_WRITE_ONCE "
-                               "previously\n", uid);
-        val->print(PRINT_TEST, "[Check 1] Retrieve metadata for UID %d and check content\n", uid);
+                               "previously\n", (int32_t)uid);
+        val->print(PRINT_TEST, "[Check 1] Retrieve metadata for UID %d and check content\n",
+                               (int32_t)uid);
         goto check_write_once_uid_metadata;
     } else
     {
@@ -68,7 +69,8 @@
     TEST_ASSERT_MEMCMP(write_buff, read_buff, TEST_BUFF_SIZE/2, TEST_CHECKPOINT_NUM(7));
 
     /* set() with WRITE_ONCE_FLAG */
-    val->print(PRINT_TEST, "[Check 1] Update the flag of UID %d with WRITE_ONCE flag\n", uid);
+    val->print(PRINT_TEST, "[Check 1] Update the flag of UID %d with WRITE_ONCE flag\n",
+                            (int32_t)uid);
     status = STORAGE_FUNCTION(s002_data[VAL_TEST_IDX7].api[fCode], uid, TEST_BUFF_SIZE/4,
                               write_buff_new, PSA_STORAGE_FLAG_WRITE_ONCE);
     TEST_ASSERT_EQUAL(status, s002_data[VAL_TEST_IDX7].status, TEST_CHECKPOINT_NUM(8));
@@ -88,7 +90,8 @@
     TEST_ASSERT_MEMCMP(write_buff_new, read_buff, TEST_BUFF_SIZE/4, TEST_CHECKPOINT_NUM(14));
 
     /* remove() the UID */
-    val->print(PRINT_TEST, "[Check 2] Try to remove the UID %d having WRITE_ONCE flag\n", uid);
+    val->print(PRINT_TEST, "[Check 2] Try to remove the UID %d having WRITE_ONCE flag\n",
+                            (int32_t)uid);
     status = STORAGE_FUNCTION(s002_data[VAL_TEST_IDX13].api[fCode], uid);
     TEST_ASSERT_EQUAL(status, s002_data[VAL_TEST_IDX13].status, TEST_CHECKPOINT_NUM(15));
 
@@ -112,20 +115,21 @@
                                                             0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
 
     /* Set data for a UID using WRITE_ONCE flag */
-    val->print(PRINT_TEST, "[Check 3] Create a new UID %d with WRITE_ONCE flag\n", uid);
+    val->print(PRINT_TEST, "[Check 3] Create a new UID %d with WRITE_ONCE flag\n", (int32_t)uid);
     status = STORAGE_FUNCTION(s002_data[VAL_TEST_IDX14].api[fCode], uid, TEST_BUFF_SIZE, write_buff,
                           PSA_STORAGE_FLAG_WRITE_ONCE);
     if (status == PSA_ERROR_NOT_PERMITTED)
     {
         val->print(PRINT_TEST, "[Info ] UID %d was created with PSA_STORAGE_FLAG_WRITE_ONCE "
-                               "previously\n", uid);
+                               "previously\n", (int32_t)uid);
     } else
     {
         TEST_ASSERT_EQUAL(status, s002_data[VAL_TEST_IDX14].status, TEST_CHECKPOINT_NUM(16));
     }
 
     /* Check that remove() fails with PSA_SST_ERROR_WRITE_ONCE */
-    val->print(PRINT_TEST, "[Check 4] Try to remove the UID %d having WRITE_ONCE flag\n", uid);
+    val->print(PRINT_TEST, "[Check 4] Try to remove the UID %d having WRITE_ONCE flag\n",
+                            (int32_t)uid);
     status = STORAGE_FUNCTION(s002_data[VAL_TEST_IDX15].api[fCode], uid);
     TEST_ASSERT_EQUAL(status, s002_data[VAL_TEST_IDX15].status, TEST_CHECKPOINT_NUM(17));
 
@@ -143,7 +147,8 @@
     TEST_ASSERT_EQUAL(orig_info.flags, PSA_STORAGE_FLAG_WRITE_ONCE, TEST_CHECKPOINT_NUM(23));
 
     /* Try to overwrite using set() with same UID as used before with WRITE_ONCE_FLAG */
-    val->print(PRINT_TEST, "[Check 5] Try to change the length of write_once UID %d\n", uid);
+    val->print(PRINT_TEST, "[Check 5] Try to change the length of write_once UID %d\n",
+                            (int32_t)uid);
     status = STORAGE_FUNCTION(s002_data[VAL_TEST_IDX21].api[fCode], uid, (TEST_BUFF_SIZE + 1),
                           write_buff_new, PSA_STORAGE_FLAG_WRITE_ONCE);
     TEST_ASSERT_EQUAL(status, s002_data[VAL_TEST_IDX21].status, TEST_CHECKPOINT_NUM(24));
@@ -167,7 +172,8 @@
     TEST_ASSERT_MEMCMP(write_buff, read_buff, TEST_BUFF_SIZE, TEST_CHECKPOINT_NUM(31));
 
     /* Try to overwrite using set() with same UID as used before without WRITE_ONCE_FLAG */
-    val->print(PRINT_TEST, "[Check 7] Try to change the WRITE_ONCE flag to None for UID %d\n", uid);
+    val->print(PRINT_TEST, "[Check 7] Try to change the WRITE_ONCE flag to None for UID %d\n",
+                            (int32_t)uid);
     new_info.size  = 0;
     new_info.flags = 0;
     status = STORAGE_FUNCTION(s002_data[VAL_TEST_IDX28].api[fCode], uid, (TEST_BUFF_SIZE - 1),
@@ -188,7 +194,7 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t s002_storage_test(caller_security_t caller)
+int32_t s002_storage_test(caller_security_t caller __UNUSED)
 {
     int32_t status;
 
diff --git a/api-tests/dev_apis/storage/test_s003/test_s003.c b/api-tests/dev_apis/storage/test_s003/test_s003.c
index 282f326..6ffe16f 100755
--- a/api-tests/dev_apis/storage/test_s003/test_s003.c
+++ b/api-tests/dev_apis/storage/test_s003/test_s003.c
@@ -50,28 +50,29 @@
         for (uid = TEST_BASE_UID_VALUE; status == PSA_SUCCESS; uid++)
         {
             val->print(PRINT_INFO, "Setting 0x%x bytes for ", ARCH_TEST_STORAGE_UID_MAX_SIZE);
-            val->print(PRINT_INFO, "UID %d\n", uid);
+            val->print(PRINT_INFO, "UID %d\n", (int32_t)uid);
             status = STORAGE_FUNCTION(s003_data[VAL_TEST_IDX1].api[fCode], uid,
                                       ARCH_TEST_STORAGE_UID_MAX_SIZE, write_buff,
                                       PSA_STORAGE_FLAG_NONE);
             if (status != PSA_SUCCESS)
             {
-                val->print(PRINT_TEST, "UID %d set failed due to insufficient space\n", uid);
+                val->print(PRINT_TEST, "UID %d set failed due to insufficient space\n",
+                                       (int32_t)uid);
                 break;
             }
         }
         TEST_ASSERT_EQUAL(status, s003_data[VAL_TEST_IDX1].status, TEST_CHECKPOINT_NUM(1));
 
         /* Store number of set()s it took to saturate the storage */
-        count = uid - (TEST_BASE_UID_VALUE);
-        results[i] = uid - (TEST_BASE_UID_VALUE);
+        count = (uint32_t)uid - (TEST_BASE_UID_VALUE);
+        results[i] = count;
 
         if (count) {
            val->print(PRINT_TEST, "Remove all registered UIDs\n", 0);
         }
         for (uid = TEST_BASE_UID_VALUE; uid < (count + TEST_BASE_UID_VALUE); uid++)
         {
-            val->print(PRINT_INFO, "Removing UID %d\n", uid);
+            val->print(PRINT_INFO, "Removing UID %d\n", (int32_t)uid);
             status = STORAGE_FUNCTION(s003_data[VAL_TEST_IDX2].api[fCode], uid);
             if (status != PSA_SUCCESS)
                 break;
@@ -95,7 +96,7 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t s003_storage_test(caller_security_t caller)
+int32_t s003_storage_test(caller_security_t caller __UNUSED)
 {
     int32_t status;
 
diff --git a/api-tests/dev_apis/storage/test_s004/test_s004.c b/api-tests/dev_apis/storage/test_s004/test_s004.c
index dfa600e..7d7b566 100644
--- a/api-tests/dev_apis/storage/test_s004/test_s004.c
+++ b/api-tests/dev_apis/storage/test_s004/test_s004.c
@@ -74,7 +74,7 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t s004_storage_test(caller_security_t caller)
+int32_t s004_storage_test(caller_security_t caller __UNUSED)
 {
     int32_t status;
 
diff --git a/api-tests/dev_apis/storage/test_s005/test_s005.c b/api-tests/dev_apis/storage/test_s005/test_s005.c
index 9d2acb0..df41007 100644
--- a/api-tests/dev_apis/storage/test_s005/test_s005.c
+++ b/api-tests/dev_apis/storage/test_s005/test_s005.c
@@ -92,7 +92,7 @@
     return status;
 }
 
-int32_t s005_storage_test(caller_security_t caller)
+int32_t s005_storage_test(caller_security_t caller __UNUSED)
 {
     int32_t status;
 
diff --git a/api-tests/dev_apis/storage/test_s006/test_s006.c b/api-tests/dev_apis/storage/test_s006/test_s006.c
index d5a4100..d68ae32 100755
--- a/api-tests/dev_apis/storage/test_s006/test_s006.c
+++ b/api-tests/dev_apis/storage/test_s006/test_s006.c
@@ -34,8 +34,6 @@
 
 static int32_t psa_sst_remove_api(storage_function_code_t    fCode,
                                   psa_storage_uid_t          uid,
-                                  uint32_t                   data_len,
-                                  uint8_t                    *data_buff,
                                   psa_storage_create_flags_t create_flag)
 {
     int32_t status;
@@ -69,7 +67,7 @@
                           create_flag);
     if (status == s006_data[VAL_TEST_IDX1].status)
     {
-        test_status = psa_sst_remove_api(fCode, uid, data_len, data_buff, create_flag);
+        test_status = psa_sst_remove_api(fCode, uid, create_flag);
         if (test_status != VAL_STATUS_SUCCESS)
         {
             return test_status;
@@ -126,7 +124,7 @@
     return status;
 }
 
-int32_t s006_storage_test(caller_security_t caller)
+int32_t s006_storage_test(caller_security_t caller __UNUSED)
 {
     int32_t status;
 
diff --git a/api-tests/dev_apis/storage/test_s007/test_s007.c b/api-tests/dev_apis/storage/test_s007/test_s007.c
index 2275089..69f9734 100755
--- a/api-tests/dev_apis/storage/test_s007/test_s007.c
+++ b/api-tests/dev_apis/storage/test_s007/test_s007.c
@@ -108,7 +108,7 @@
     return status;
 }
 
-int32_t s007_storage_test(caller_security_t caller)
+int32_t s007_storage_test(caller_security_t caller __UNUSED)
 {
     int32_t status;
 
diff --git a/api-tests/dev_apis/storage/test_s008/test_s008.c b/api-tests/dev_apis/storage/test_s008/test_s008.c
index 99ef8ac..c8b5f71 100644
--- a/api-tests/dev_apis/storage/test_s008/test_s008.c
+++ b/api-tests/dev_apis/storage/test_s008/test_s008.c
@@ -123,7 +123,7 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t s008_storage_test(caller_security_t caller)
+int32_t s008_storage_test(caller_security_t caller __UNUSED)
 {
     int32_t status;
 
diff --git a/api-tests/dev_apis/storage/test_s009/test_s009.c b/api-tests/dev_apis/storage/test_s009/test_s009.c
index 1cc22e4..4eeb647 100644
--- a/api-tests/dev_apis/storage/test_s009/test_s009.c
+++ b/api-tests/dev_apis/storage/test_s009/test_s009.c
@@ -95,7 +95,7 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t s009_storage_test(caller_security_t caller)
+int32_t s009_storage_test(caller_security_t caller __UNUSED)
 {
     int32_t status;
 
diff --git a/api-tests/dev_apis/storage/test_s010/test_s010.c b/api-tests/dev_apis/storage/test_s010/test_s010.c
index abcdb12..1fc46f2 100644
--- a/api-tests/dev_apis/storage/test_s010/test_s010.c
+++ b/api-tests/dev_apis/storage/test_s010/test_s010.c
@@ -55,7 +55,7 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t s010_storage_test(caller_security_t caller)
+int32_t s010_storage_test(caller_security_t caller __UNUSED)
 {
     int32_t status;
 
diff --git a/api-tests/dev_apis/storage/test_s011/test_s011.c b/api-tests/dev_apis/storage/test_s011/test_s011.c
index feb3319..ab7e985 100644
--- a/api-tests/dev_apis/storage/test_s011/test_s011.c
+++ b/api-tests/dev_apis/storage/test_s011/test_s011.c
@@ -41,7 +41,8 @@
     struct psa_storage_info_t orig_info;
 
     /* Call the set_extended API with UID which is not created */
-    val->print(PRINT_TEST, "[Check 1] Call set_extended API for UID %d which is not set\n", p_uid);
+    val->print(PRINT_TEST, "[Check 1] Call set_extended API for UID %d which is not set\n",
+                            (int32_t)p_uid);
     status = STORAGE_FUNCTION(s011_data[VAL_TEST_IDX1].api[fCode], p_uid, 0, TEST_BUFF_SIZE,
                               write_buff);
     TEST_ASSERT_EQUAL(status, s011_data[VAL_TEST_IDX1].status, TEST_CHECKPOINT_NUM(1));
@@ -101,7 +102,8 @@
     TEST_ASSERT_EQUAL(status, s011_data[VAL_TEST_IDX13].status, TEST_CHECKPOINT_NUM(14));
 
     /* Call the set_extended API with UID which is removed */
-    val->print(PRINT_TEST, "[Check 5] Call set_extended API for UID %d which is removed\n", p_uid);
+    val->print(PRINT_TEST, "[Check 5] Call set_extended API for UID %d which is removed\n",
+                            (int32_t)p_uid);
     status = STORAGE_FUNCTION(s011_data[VAL_TEST_IDX14].api[fCode], p_uid, 0, TEST_BUFF_SIZE,
                               write_buff);
     TEST_ASSERT_EQUAL(status, s011_data[VAL_TEST_IDX14].status, TEST_CHECKPOINT_NUM(15));
@@ -111,7 +113,7 @@
 
 static int32_t psa_sst_optional_api_uid_not_found(storage_function_code_t fCode)
 {
-    uint32_t status;
+    int32_t status;
     int32_t test_status;
 
     /* Call the get_support API and check if create and set_extended API are supported */
@@ -133,7 +135,7 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t s011_storage_test(caller_security_t caller)
+int32_t s011_storage_test(caller_security_t caller __UNUSED)
 {
     int32_t status;
 
diff --git a/api-tests/dev_apis/storage/test_s012/test_s012.c b/api-tests/dev_apis/storage/test_s012/test_s012.c
index dfacd7e..ed0d452 100644
--- a/api-tests/dev_apis/storage/test_s012/test_s012.c
+++ b/api-tests/dev_apis/storage/test_s012/test_s012.c
@@ -157,7 +157,7 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t s012_storage_test(caller_security_t caller)
+int32_t s012_storage_test(caller_security_t caller __UNUSED)
 {
     int32_t status;
 
diff --git a/api-tests/dev_apis/storage/test_s013/test_s013.c b/api-tests/dev_apis/storage/test_s013/test_s013.c
index 45cce6c..fc81f85 100644
--- a/api-tests/dev_apis/storage/test_s013/test_s013.c
+++ b/api-tests/dev_apis/storage/test_s013/test_s013.c
@@ -157,7 +157,7 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t s013_storage_test(caller_security_t caller)
+int32_t s013_storage_test(caller_security_t caller __UNUSED)
 {
     int32_t status;
 
diff --git a/api-tests/dev_apis/storage/test_s014/test_s014.c b/api-tests/dev_apis/storage/test_s014/test_s014.c
index d0f69a8..7fb91b0 100644
--- a/api-tests/dev_apis/storage/test_s014/test_s014.c
+++ b/api-tests/dev_apis/storage/test_s014/test_s014.c
@@ -98,7 +98,7 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t s014_storage_test(caller_security_t caller)
+int32_t s014_storage_test(caller_security_t caller __UNUSED)
 {
     int32_t status;
 
diff --git a/api-tests/dev_apis/storage/test_s015/test_s015.c b/api-tests/dev_apis/storage/test_s015/test_s015.c
index a38991b..15f54ea 100644
--- a/api-tests/dev_apis/storage/test_s015/test_s015.c
+++ b/api-tests/dev_apis/storage/test_s015/test_s015.c
@@ -54,7 +54,7 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t s015_storage_test(caller_security_t caller)
+int32_t s015_storage_test(caller_security_t caller __UNUSED)
 {
     int32_t status;
 
diff --git a/api-tests/dev_apis/storage/test_s016/test_s016.c b/api-tests/dev_apis/storage/test_s016/test_s016.c
index aed4ecb..36ac12f 100644
--- a/api-tests/dev_apis/storage/test_s016/test_s016.c
+++ b/api-tests/dev_apis/storage/test_s016/test_s016.c
@@ -121,7 +121,7 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t s016_storage_test(caller_security_t caller)
+int32_t s016_storage_test(caller_security_t caller __UNUSED)
 {
     int32_t status;
 
diff --git a/api-tests/dev_apis/storage/test_s017/test_s017.c b/api-tests/dev_apis/storage/test_s017/test_s017.c
index 10f240f..e3ac870 100644
--- a/api-tests/dev_apis/storage/test_s017/test_s017.c
+++ b/api-tests/dev_apis/storage/test_s017/test_s017.c
@@ -77,7 +77,7 @@
 
 static int32_t psa_sst_optional_api_partial_write_check(storage_function_code_t fCode)
 {
-    uint32_t status;
+    int32_t status;
     int32_t test_status;
 
     /* Call the get_support API and check if create and set_extended API are supported */
@@ -99,7 +99,7 @@
     return VAL_STATUS_SUCCESS;
 }
 
-int32_t s017_storage_test(caller_security_t caller)
+int32_t s017_storage_test(caller_security_t caller __UNUSED)
 {
     int32_t status;
 
diff --git a/api-tests/ff/ipc/test_i001/test_i001.c b/api-tests/ff/ipc/test_i001/test_i001.c
index ef4a498..0b9df57 100644
--- a/api-tests/ff/ipc/test_i001/test_i001.c
+++ b/api-tests/ff/ipc/test_i001/test_i001.c
@@ -32,7 +32,7 @@
     NULL,
 };
 
-int32_t client_test_psa_framework_version(caller_security_t caller)
+int32_t client_test_psa_framework_version(caller_security_t caller __UNUSED)
 {
    int32_t         status = VAL_STATUS_SUCCESS;
 
diff --git a/api-tests/ff/ipc/test_i002/test_i002.c b/api-tests/ff/ipc/test_i002/test_i002.c
index 76e4a1f..0546a46 100644
--- a/api-tests/ff/ipc/test_i002/test_i002.c
+++ b/api-tests/ff/ipc/test_i002/test_i002.c
@@ -39,7 +39,7 @@
     NULL,
 };
 
-int32_t client_test_connection_busy_and_reject(caller_security_t caller)
+int32_t client_test_connection_busy_and_reject(caller_security_t caller __UNUSED)
 {
     int32_t         status = VAL_STATUS_SUCCESS;
     psa_handle_t    handle = 0;
@@ -74,7 +74,7 @@
    return status;
 }
 
-int32_t client_test_accept_and_close_connect(caller_security_t caller)
+int32_t client_test_accept_and_close_connect(caller_security_t caller __UNUSED)
 {
    psa_handle_t     handle = 0;
 
@@ -95,7 +95,7 @@
    return VAL_STATUS_SUCCESS;
 }
 
-int32_t client_test_connect_with_allowed_version_policy(caller_security_t caller)
+int32_t client_test_connect_with_allowed_version_policy(caller_security_t caller __UNUSED)
 {
    psa_handle_t     handle = 0;
    uint32_t         i = 0;
@@ -158,7 +158,7 @@
    return status;
 }
 
-int32_t client_test_psa_call_with_allowed_status_code(caller_security_t caller)
+int32_t client_test_psa_call_with_allowed_status_code(caller_security_t caller __UNUSED)
 {
    int32_t         status = VAL_STATUS_SUCCESS;
    psa_status_t    expected_status_code[] = {PSA_SUCCESS, 1, 2, INT32_MAX, -1, -2, INT32_MIN+128};
@@ -180,7 +180,7 @@
    return status;
 }
 
-int32_t client_test_psa_call_with_allowed_type_values(caller_security_t caller)
+int32_t client_test_psa_call_with_allowed_type_values(caller_security_t caller __UNUSED)
 {
    int32_t            status = VAL_STATUS_SUCCESS;
    psa_handle_t       handle = 0;
@@ -251,7 +251,7 @@
    return status;
 }
 
-int32_t client_test_spm_concurrent_connect_limit(caller_security_t caller)
+int32_t client_test_spm_concurrent_connect_limit(caller_security_t caller __UNUSED)
 {
    int32_t         status = VAL_STATUS_SUCCESS;
    psa_handle_t    handle[CONNECT_LIMIT] = {0};
@@ -310,13 +310,13 @@
    return VAL_STATUS_SUCCESS;
 }
 
-int32_t client_test_psa_block_behave(caller_security_t caller)
+int32_t client_test_psa_block_behave(caller_security_t caller __UNUSED)
 {
    val->print(PRINT_TEST, "[Check 8] Test PSA_BLOCK\n", 0);
    return (client_test_psa_wait());
 }
 
-int32_t client_test_psa_poll_behave(caller_security_t caller)
+int32_t client_test_psa_poll_behave(caller_security_t caller __UNUSED)
 {
    val->print(PRINT_TEST, "[Check 9] Test PSA_POLL\n", 0);
    return (client_test_psa_wait());
diff --git a/api-tests/ff/ipc/test_i003/test_i003.c b/api-tests/ff/ipc/test_i003/test_i003.c
index 1a61ad6..9a3e20c 100644
--- a/api-tests/ff/ipc/test_i003/test_i003.c
+++ b/api-tests/ff/ipc/test_i003/test_i003.c
@@ -37,7 +37,7 @@
     NULL,
 };
 
-int32_t client_test_zero_length_invec(caller_security_t caller)
+int32_t client_test_zero_length_invec(caller_security_t caller __UNUSED)
 {
    int32_t              status = VAL_STATUS_SUCCESS;
    psa_handle_t         handle = 0;
@@ -93,7 +93,7 @@
    return status;
 }
 
-int32_t client_test_zero_length_outvec(caller_security_t caller)
+int32_t client_test_zero_length_outvec(caller_security_t caller __UNUSED)
 {
    int32_t              status = VAL_STATUS_SUCCESS;
    psa_handle_t         handle = 0;
@@ -151,7 +151,7 @@
    return status;
 }
 
-int32_t client_test_call_read_and_skip(caller_security_t caller)
+int32_t client_test_call_read_and_skip(caller_security_t caller __UNUSED)
 {
    int32_t              status = VAL_STATUS_SUCCESS;
    int                  data1[2] = {0xaa, 0xbb};
@@ -188,7 +188,7 @@
    return status;
 }
 
-int32_t client_test_call_and_write(caller_security_t caller)
+int32_t client_test_call_and_write(caller_security_t caller __UNUSED)
 {
    int32_t              status = VAL_STATUS_SUCCESS;
    int                  data[4] = {0}, expected_data[4] = {0xaa, 0xbb, 0xcc, 0xeedd}, i;
@@ -250,7 +250,7 @@
    return status;
 }
 
-int32_t client_test_psa_set_rhandle(caller_security_t caller)
+int32_t client_test_psa_set_rhandle(caller_security_t caller __UNUSED)
 {
    int32_t            status = VAL_STATUS_SUCCESS;
    psa_handle_t       handle = 0;
@@ -286,7 +286,7 @@
    return status;
 }
 
-int32_t client_test_overlapping_vectors(caller_security_t caller)
+int32_t client_test_overlapping_vectors(caller_security_t caller __UNUSED)
 {
    int32_t            status = VAL_STATUS_SUCCESS;
    psa_handle_t       handle = 0;
diff --git a/api-tests/ff/ipc/test_i009/test_i009.c b/api-tests/ff/ipc/test_i009/test_i009.c
index 3c1ba45..13ab0b7 100644
--- a/api-tests/ff/ipc/test_i009/test_i009.c
+++ b/api-tests/ff/ipc/test_i009/test_i009.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_unspecified_dependent_sid(caller_security_t caller)
+int32_t client_test_unspecified_dependent_sid(caller_security_t caller __UNUSED)
 {
    psa_handle_t       handle = 0;
 
diff --git a/api-tests/ff/ipc/test_i013/test_i013.c b/api-tests/ff/ipc/test_i013/test_i013.c
index 61c4e25..5bf872d 100644
--- a/api-tests/ff/ipc/test_i013/test_i013.c
+++ b/api-tests/ff/ipc/test_i013/test_i013.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_get_with_more_than_one_signal(caller_security_t caller)
+int32_t client_test_psa_get_with_more_than_one_signal(caller_security_t caller __UNUSED)
 {
    psa_handle_t       handle = 0;
 
diff --git a/api-tests/ff/ipc/test_i014/test_i014.c b/api-tests/ff/ipc/test_i014/test_i014.c
index 361fb3e..e01baa2 100644
--- a/api-tests/ff/ipc/test_i014/test_i014.c
+++ b/api-tests/ff/ipc/test_i014/test_i014.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_get_called_twice(caller_security_t caller)
+int32_t client_test_psa_get_called_twice(caller_security_t caller __UNUSED)
 {
    psa_handle_t       handle = 0;
 
diff --git a/api-tests/ff/ipc/test_i015/test_i015.c b/api-tests/ff/ipc/test_i015/test_i015.c
index 8c13c24..edfc414 100644
--- a/api-tests/ff/ipc/test_i015/test_i015.c
+++ b/api-tests/ff/ipc/test_i015/test_i015.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_get_with_non_rot_signal(caller_security_t caller)
+int32_t client_test_psa_get_with_non_rot_signal(caller_security_t caller __UNUSED)
 {
    psa_handle_t       handle = 0;
 
diff --git a/api-tests/ff/ipc/test_i016/test_i016.c b/api-tests/ff/ipc/test_i016/test_i016.c
index e1dcc91..943d6e3 100644
--- a/api-tests/ff/ipc/test_i016/test_i016.c
+++ b/api-tests/ff/ipc/test_i016/test_i016.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_get_with_unasserted_signal(caller_security_t caller)
+int32_t client_test_psa_get_with_unasserted_signal(caller_security_t caller __UNUSED)
 {
    psa_handle_t       handle = 0;
 
diff --git a/api-tests/ff/ipc/test_i017/test_i017.c b/api-tests/ff/ipc/test_i017/test_i017.c
index ca9bf59..c85ac08 100644
--- a/api-tests/ff/ipc/test_i017/test_i017.c
+++ b/api-tests/ff/ipc/test_i017/test_i017.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_partition_calling_its_own_rot_service(caller_security_t caller)
+int32_t client_test_partition_calling_its_own_rot_service(caller_security_t caller __UNUSED)
 {
    psa_handle_t       handle = 0;
 
diff --git a/api-tests/ff/ipc/test_i018/test_i018.c b/api-tests/ff/ipc/test_i018/test_i018.c
index c7d8467..93d2d06 100644
--- a/api-tests/ff/ipc/test_i018/test_i018.c
+++ b/api-tests/ff/ipc/test_i018/test_i018.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_set_rhandle_with_invalid_handle(caller_security_t caller)
+int32_t client_test_psa_set_rhandle_with_invalid_handle(caller_security_t caller __UNUSED)
 {
    psa_handle_t       handle = 0;
 
diff --git a/api-tests/ff/ipc/test_i019/test_i019.c b/api-tests/ff/ipc/test_i019/test_i019.c
index 6b5c6a8..b09b58f 100644
--- a/api-tests/ff/ipc/test_i019/test_i019.c
+++ b/api-tests/ff/ipc/test_i019/test_i019.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_set_rhandle_with_null_handle(caller_security_t caller)
+int32_t client_test_psa_set_rhandle_with_null_handle(caller_security_t caller __UNUSED)
 {
    psa_handle_t       handle = 0;
 
diff --git a/api-tests/ff/ipc/test_i020/test_i020.c b/api-tests/ff/ipc/test_i020/test_i020.c
index bf46bfa..c03041c 100644
--- a/api-tests/ff/ipc/test_i020/test_i020.c
+++ b/api-tests/ff/ipc/test_i020/test_i020.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_reply_with_invalid_connect_status_code(caller_security_t caller)
+int32_t client_test_psa_reply_with_invalid_connect_status_code(caller_security_t caller __UNUSED)
 {
    int32_t            status = VAL_STATUS_SUCCESS;
    psa_handle_t       handle = 0;
diff --git a/api-tests/ff/ipc/test_i021/test_i021.c b/api-tests/ff/ipc/test_i021/test_i021.c
index 788917c..2638b76 100644
--- a/api-tests/ff/ipc/test_i021/test_i021.c
+++ b/api-tests/ff/ipc/test_i021/test_i021.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_irq_routing(caller_security_t caller)
+int32_t client_test_irq_routing(caller_security_t caller __UNUSED)
 {
    psa_handle_t           handle;
    driver_test_fn_id_t    driver_test_fn_id = TEST_INTR_SERVICE;
diff --git a/api-tests/ff/ipc/test_i022/test_i022.c b/api-tests/ff/ipc/test_i022/test_i022.c
index 59cd0d0..5778436 100644
--- a/api-tests/ff/ipc/test_i022/test_i022.c
+++ b/api-tests/ff/ipc/test_i022/test_i022.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_reply_with_invalid_handle(caller_security_t caller)
+int32_t client_test_psa_reply_with_invalid_handle(caller_security_t caller __UNUSED)
 {
    psa_handle_t       handle = 0;
 
diff --git a/api-tests/ff/ipc/test_i023/test_i023.c b/api-tests/ff/ipc/test_i023/test_i023.c
index 60e6ac2..76bdf99 100644
--- a/api-tests/ff/ipc/test_i023/test_i023.c
+++ b/api-tests/ff/ipc/test_i023/test_i023.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_reply_with_null_handle(caller_security_t caller)
+int32_t client_test_psa_reply_with_null_handle(caller_security_t caller __UNUSED)
 {
    psa_handle_t       handle = 0;
 
diff --git a/api-tests/ff/ipc/test_i028/test_i028.c b/api-tests/ff/ipc/test_i028/test_i028.c
index 1f70117..c0eab7d 100644
--- a/api-tests/ff/ipc/test_i028/test_i028.c
+++ b/api-tests/ff/ipc/test_i028/test_i028.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_read_at_ipc_connect(caller_security_t caller)
+int32_t client_test_psa_read_at_ipc_connect(caller_security_t caller __UNUSED)
 {
    psa_handle_t       handle = 0;
 
diff --git a/api-tests/ff/ipc/test_i029/test_i029.c b/api-tests/ff/ipc/test_i029/test_i029.c
index 1f15e7c..326461b 100644
--- a/api-tests/ff/ipc/test_i029/test_i029.c
+++ b/api-tests/ff/ipc/test_i029/test_i029.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_read_at_ipc_disconnect(caller_security_t caller)
+int32_t client_test_psa_read_at_ipc_disconnect(caller_security_t caller __UNUSED)
 {
    psa_handle_t       handle = 0;
 
diff --git a/api-tests/ff/ipc/test_i030/test_i030.c b/api-tests/ff/ipc/test_i030/test_i030.c
index ff73a91..7f4d15b 100644
--- a/api-tests/ff/ipc/test_i030/test_i030.c
+++ b/api-tests/ff/ipc/test_i030/test_i030.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_read_with_null_handle(caller_security_t caller)
+int32_t client_test_psa_read_with_null_handle(caller_security_t caller __UNUSED)
 {
    int32_t            status = VAL_STATUS_SUCCESS;
    psa_handle_t       handle = 0;
diff --git a/api-tests/ff/ipc/test_i031/test_i031.c b/api-tests/ff/ipc/test_i031/test_i031.c
index f4ab03a..6cfe2e2 100644
--- a/api-tests/ff/ipc/test_i031/test_i031.c
+++ b/api-tests/ff/ipc/test_i031/test_i031.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_read_with_invalid_handle(caller_security_t caller)
+int32_t client_test_psa_read_with_invalid_handle(caller_security_t caller __UNUSED)
 {
    int32_t            status = VAL_STATUS_SUCCESS;
    psa_handle_t       handle = 0;
diff --git a/api-tests/ff/ipc/test_i032/test_i032.c b/api-tests/ff/ipc/test_i032/test_i032.c
index e48b425..c7e9918 100644
--- a/api-tests/ff/ipc/test_i032/test_i032.c
+++ b/api-tests/ff/ipc/test_i032/test_i032.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_read_with_invec_equal_to_max_iovec(caller_security_t caller)
+int32_t client_test_psa_read_with_invec_equal_to_max_iovec(caller_security_t caller __UNUSED)
 {
    int32_t            status = VAL_STATUS_SUCCESS;
    psa_handle_t       handle = 0;
diff --git a/api-tests/ff/ipc/test_i033/test_i033.c b/api-tests/ff/ipc/test_i033/test_i033.c
index f1ba08a..f83589c 100644
--- a/api-tests/ff/ipc/test_i033/test_i033.c
+++ b/api-tests/ff/ipc/test_i033/test_i033.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_read_with_invec_greater_than_max_iovec(caller_security_t caller)
+int32_t client_test_psa_read_with_invec_greater_than_max_iovec(caller_security_t caller __UNUSED)
 {
    int32_t            status = VAL_STATUS_SUCCESS;
    psa_handle_t       handle = 0;
diff --git a/api-tests/ff/ipc/test_i034/test_i034.c b/api-tests/ff/ipc/test_i034/test_i034.c
index 20fa8a8..b55559b 100644
--- a/api-tests/ff/ipc/test_i034/test_i034.c
+++ b/api-tests/ff/ipc/test_i034/test_i034.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_skip_at_ipc_connect(caller_security_t caller)
+int32_t client_test_psa_skip_at_ipc_connect(caller_security_t caller __UNUSED)
 {
    psa_handle_t       handle = 0;
 
diff --git a/api-tests/ff/ipc/test_i035/test_i035.c b/api-tests/ff/ipc/test_i035/test_i035.c
index 59b0e85..2cd9775 100644
--- a/api-tests/ff/ipc/test_i035/test_i035.c
+++ b/api-tests/ff/ipc/test_i035/test_i035.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_skip_at_ipc_disconnect(caller_security_t caller)
+int32_t client_test_psa_skip_at_ipc_disconnect(caller_security_t caller __UNUSED)
 {
    psa_handle_t       handle = 0;
 
diff --git a/api-tests/ff/ipc/test_i036/test_i036.c b/api-tests/ff/ipc/test_i036/test_i036.c
index ec0d106..bb85aea 100644
--- a/api-tests/ff/ipc/test_i036/test_i036.c
+++ b/api-tests/ff/ipc/test_i036/test_i036.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_skip_with_null_handle(caller_security_t caller)
+int32_t client_test_psa_skip_with_null_handle(caller_security_t caller __UNUSED)
 {
    int32_t            status = VAL_STATUS_SUCCESS;
    psa_handle_t       handle = 0;
diff --git a/api-tests/ff/ipc/test_i037/test_i037.c b/api-tests/ff/ipc/test_i037/test_i037.c
index 7c451bf..407232e 100644
--- a/api-tests/ff/ipc/test_i037/test_i037.c
+++ b/api-tests/ff/ipc/test_i037/test_i037.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_skip_with_invalid_handle(caller_security_t caller)
+int32_t client_test_psa_skip_with_invalid_handle(caller_security_t caller __UNUSED)
 {
    int32_t            status = VAL_STATUS_SUCCESS;
    psa_handle_t       handle = 0;
diff --git a/api-tests/ff/ipc/test_i038/test_i038.c b/api-tests/ff/ipc/test_i038/test_i038.c
index 4d951d5..2a2a2e6 100644
--- a/api-tests/ff/ipc/test_i038/test_i038.c
+++ b/api-tests/ff/ipc/test_i038/test_i038.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_skip_with_invec_equal_to_max_iovec(caller_security_t caller)
+int32_t client_test_psa_skip_with_invec_equal_to_max_iovec(caller_security_t caller __UNUSED)
 {
    int32_t            status = VAL_STATUS_SUCCESS;
    psa_handle_t       handle = 0;
diff --git a/api-tests/ff/ipc/test_i039/test_i039.c b/api-tests/ff/ipc/test_i039/test_i039.c
index a9bb801..26bd8a7 100644
--- a/api-tests/ff/ipc/test_i039/test_i039.c
+++ b/api-tests/ff/ipc/test_i039/test_i039.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_skip_with_invec_greater_than_max_iovec(caller_security_t caller)
+int32_t client_test_psa_skip_with_invec_greater_than_max_iovec(caller_security_t caller __UNUSED)
 {
    int32_t            status = VAL_STATUS_SUCCESS;
    psa_handle_t       handle = 0;
diff --git a/api-tests/ff/ipc/test_i040/test_i040.c b/api-tests/ff/ipc/test_i040/test_i040.c
index 4125c26..1e8aade 100644
--- a/api-tests/ff/ipc/test_i040/test_i040.c
+++ b/api-tests/ff/ipc/test_i040/test_i040.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_write_at_ipc_connect(caller_security_t caller)
+int32_t client_test_psa_write_at_ipc_connect(caller_security_t caller __UNUSED)
 {
    psa_handle_t       handle = 0;
 
diff --git a/api-tests/ff/ipc/test_i041/test_i041.c b/api-tests/ff/ipc/test_i041/test_i041.c
index 2b51c6f..7498e82 100644
--- a/api-tests/ff/ipc/test_i041/test_i041.c
+++ b/api-tests/ff/ipc/test_i041/test_i041.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_write_at_ipc_disconnect(caller_security_t caller)
+int32_t client_test_psa_write_at_ipc_disconnect(caller_security_t caller __UNUSED)
 {
    psa_handle_t       handle = 0;
 
diff --git a/api-tests/ff/ipc/test_i042/test_i042.c b/api-tests/ff/ipc/test_i042/test_i042.c
index f0ec5c3..9c8e4ce 100644
--- a/api-tests/ff/ipc/test_i042/test_i042.c
+++ b/api-tests/ff/ipc/test_i042/test_i042.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_write_with_null_handle(caller_security_t caller)
+int32_t client_test_psa_write_with_null_handle(caller_security_t caller __UNUSED)
 {
    int32_t            status = VAL_STATUS_SUCCESS;
    psa_handle_t       handle = 0;
diff --git a/api-tests/ff/ipc/test_i043/test_i043.c b/api-tests/ff/ipc/test_i043/test_i043.c
index cc12284..1030e65 100644
--- a/api-tests/ff/ipc/test_i043/test_i043.c
+++ b/api-tests/ff/ipc/test_i043/test_i043.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_write_with_invalid_handle(caller_security_t caller)
+int32_t client_test_psa_write_with_invalid_handle(caller_security_t caller __UNUSED)
 {
    int32_t            status = VAL_STATUS_SUCCESS;
    psa_handle_t       handle = 0;
diff --git a/api-tests/ff/ipc/test_i044/test_i044.c b/api-tests/ff/ipc/test_i044/test_i044.c
index e6a42b9..09050d2 100644
--- a/api-tests/ff/ipc/test_i044/test_i044.c
+++ b/api-tests/ff/ipc/test_i044/test_i044.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_write_with_invec_equal_to_max_iovec(caller_security_t caller)
+int32_t client_test_psa_write_with_invec_equal_to_max_iovec(caller_security_t caller __UNUSED)
 {
    int32_t            status = VAL_STATUS_SUCCESS;
    psa_handle_t       handle = 0;
diff --git a/api-tests/ff/ipc/test_i045/test_i045.c b/api-tests/ff/ipc/test_i045/test_i045.c
index 9627251..774e9cd 100644
--- a/api-tests/ff/ipc/test_i045/test_i045.c
+++ b/api-tests/ff/ipc/test_i045/test_i045.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_write_with_invec_greater_than_max_iovec(caller_security_t caller)
+int32_t client_test_psa_write_with_invec_greater_than_max_iovec(caller_security_t caller __UNUSED)
 {
    int32_t            status = VAL_STATUS_SUCCESS;
    psa_handle_t       handle = 0;
diff --git a/api-tests/ff/ipc/test_i046/test_i046.c b/api-tests/ff/ipc/test_i046/test_i046.c
index ff34db2..8aea6db 100644
--- a/api-tests/ff/ipc/test_i046/test_i046.c
+++ b/api-tests/ff/ipc/test_i046/test_i046.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_write_with_size_overflow(caller_security_t caller)
+int32_t client_test_psa_write_with_size_overflow(caller_security_t caller __UNUSED)
 {
    int32_t            status = VAL_STATUS_SUCCESS;
    psa_handle_t       handle = 0;
diff --git a/api-tests/ff/ipc/test_i047/test_i047.c b/api-tests/ff/ipc/test_i047/test_i047.c
index 0485a6a..f5d9502 100644
--- a/api-tests/ff/ipc/test_i047/test_i047.c
+++ b/api-tests/ff/ipc/test_i047/test_i047.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_get_with_invalid_msg_pointer(caller_security_t caller)
+int32_t client_test_psa_get_with_invalid_msg_pointer(caller_security_t caller __UNUSED)
 {
    psa_handle_t       handle = 0;
 
diff --git a/api-tests/ff/ipc/test_i054/test_i054.c b/api-tests/ff/ipc/test_i054/test_i054.c
index 1d8ab50..cf05d6d 100644
--- a/api-tests/ff/ipc/test_i054/test_i054.c
+++ b/api-tests/ff/ipc/test_i054/test_i054.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_call_with_not_writable_outvec_base(caller_security_t caller)
+int32_t client_test_psa_call_with_not_writable_outvec_base(caller_security_t caller __UNUSED)
 {
    int32_t                 status = VAL_STATUS_SUCCESS;
    psa_handle_t            handle = 0;
diff --git a/api-tests/ff/ipc/test_i055/test_i055.c b/api-tests/ff/ipc/test_i055/test_i055.c
index 0e92d5a..cbec364 100644
--- a/api-tests/ff/ipc/test_i055/test_i055.c
+++ b/api-tests/ff/ipc/test_i055/test_i055.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_read_with_invalid_buffer_addr(caller_security_t caller)
+int32_t client_test_psa_read_with_invalid_buffer_addr(caller_security_t caller __UNUSED)
 {
    int32_t            status = VAL_STATUS_SUCCESS;
    uint8_t            data = 0x11;
diff --git a/api-tests/ff/ipc/test_i056/test_i056.c b/api-tests/ff/ipc/test_i056/test_i056.c
index 40a0584..291e0d0 100644
--- a/api-tests/ff/ipc/test_i056/test_i056.c
+++ b/api-tests/ff/ipc/test_i056/test_i056.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_read_with_not_writable_buffer_addr(caller_security_t caller)
+int32_t client_test_psa_read_with_not_writable_buffer_addr(caller_security_t caller __UNUSED)
 {
    int32_t            status = VAL_STATUS_SUCCESS;
    uint8_t            data = 0x11;
diff --git a/api-tests/ff/ipc/test_i057/test_i057.c b/api-tests/ff/ipc/test_i057/test_i057.c
index 3e63406..95c265a 100644
--- a/api-tests/ff/ipc/test_i057/test_i057.c
+++ b/api-tests/ff/ipc/test_i057/test_i057.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_write_with_invalid_buffer_addr(caller_security_t caller)
+int32_t client_test_psa_write_with_invalid_buffer_addr(caller_security_t caller __UNUSED)
 {
    int32_t            status = VAL_STATUS_SUCCESS;
    uint8_t            data = 0x11;
diff --git a/api-tests/ff/ipc/test_i058/test_i058.c b/api-tests/ff/ipc/test_i058/test_i058.c
index c4675d6..6ffdd77 100644
--- a/api-tests/ff/ipc/test_i058/test_i058.c
+++ b/api-tests/ff/ipc/test_i058/test_i058.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_doorbell_signal(caller_security_t caller)
+int32_t client_test_psa_doorbell_signal(caller_security_t caller __UNUSED)
 {
    int32_t            status = VAL_STATUS_SUCCESS;
    psa_handle_t       handle = 0;
diff --git a/api-tests/ff/ipc/test_i059/test_i059.c b/api-tests/ff/ipc/test_i059/test_i059.c
index 936154e..0f3f30b 100644
--- a/api-tests/ff/ipc/test_i059/test_i059.c
+++ b/api-tests/ff/ipc/test_i059/test_i059.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_notify_with_neg_part_id(caller_security_t caller)
+int32_t client_test_psa_notify_with_neg_part_id(caller_security_t caller __UNUSED)
 {
    return VAL_STATUS_SUCCESS;
 }
diff --git a/api-tests/ff/ipc/test_i060/test_i060.c b/api-tests/ff/ipc/test_i060/test_i060.c
index 05c5031..3cc5219 100644
--- a/api-tests/ff/ipc/test_i060/test_i060.c
+++ b/api-tests/ff/ipc/test_i060/test_i060.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_notify_with_invalid_pos_part_id(caller_security_t caller)
+int32_t client_test_psa_notify_with_invalid_pos_part_id(caller_security_t caller __UNUSED)
 {
    return VAL_STATUS_SUCCESS;
 }
diff --git a/api-tests/ff/ipc/test_i061/test_i061.c b/api-tests/ff/ipc/test_i061/test_i061.c
index 1576148..1711eb3 100644
--- a/api-tests/ff/ipc/test_i061/test_i061.c
+++ b/api-tests/ff/ipc/test_i061/test_i061.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_clear_at_unasserted_doorbell_sig(caller_security_t caller)
+int32_t client_test_psa_clear_at_unasserted_doorbell_sig(caller_security_t caller __UNUSED)
 {
    return VAL_STATUS_SUCCESS;
 }
diff --git a/api-tests/ff/ipc/test_i062/test_i062.c b/api-tests/ff/ipc/test_i062/test_i062.c
index 3894d84..2a4ccf5 100644
--- a/api-tests/ff/ipc/test_i062/test_i062.c
+++ b/api-tests/ff/ipc/test_i062/test_i062.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_wait_with_unassigned_signal(caller_security_t caller)
+int32_t client_test_psa_wait_with_unassigned_signal(caller_security_t caller __UNUSED)
 {
    return VAL_STATUS_SUCCESS;
 }
diff --git a/api-tests/ff/ipc/test_i063/test_i063.c b/api-tests/ff/ipc/test_i063/test_i063.c
index a9bdd93..644aa65 100644
--- a/api-tests/ff/ipc/test_i063/test_i063.c
+++ b/api-tests/ff/ipc/test_i063/test_i063.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_wait_signal_mask(caller_security_t caller)
+int32_t client_test_psa_wait_signal_mask(caller_security_t caller __UNUSED)
 {
    psa_handle_t     handle = 0;
 
diff --git a/api-tests/ff/ipc/test_i064/test_i064.c b/api-tests/ff/ipc/test_i064/test_i064.c
index a735528..e627fc3 100644
--- a/api-tests/ff/ipc/test_i064/test_i064.c
+++ b/api-tests/ff/ipc/test_i064/test_i064.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_eoi_with_non_intr_signal(caller_security_t caller)
+int32_t client_test_psa_eoi_with_non_intr_signal(caller_security_t caller __UNUSED)
 {
    psa_handle_t           handle;
    driver_test_fn_id_t    driver_test_fn_id = TEST_PSA_EOI_WITH_NON_INTR_SIGNAL;
diff --git a/api-tests/ff/ipc/test_i065/test_i065.c b/api-tests/ff/ipc/test_i065/test_i065.c
index 7560f49..518dce4 100644
--- a/api-tests/ff/ipc/test_i065/test_i065.c
+++ b/api-tests/ff/ipc/test_i065/test_i065.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_eoi_with_unasserted_signal(caller_security_t caller)
+int32_t client_test_psa_eoi_with_unasserted_signal(caller_security_t caller __UNUSED)
 {
    psa_handle_t           handle;
    driver_test_fn_id_t    driver_test_fn_id = TEST_PSA_EOI_WITH_UNASSERTED_SIGNAL;
diff --git a/api-tests/ff/ipc/test_i066/test_i066.c b/api-tests/ff/ipc/test_i066/test_i066.c
index c389e98..dc602ba 100644
--- a/api-tests/ff/ipc/test_i066/test_i066.c
+++ b/api-tests/ff/ipc/test_i066/test_i066.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_eoi_with_multiple_signals(caller_security_t caller)
+int32_t client_test_psa_eoi_with_multiple_signals(caller_security_t caller __UNUSED)
 {
    psa_handle_t           handle;
    driver_test_fn_id_t    driver_test_fn_id = TEST_PSA_EOI_WITH_MULTIPLE_SIGNALS;
diff --git a/api-tests/ff/ipc/test_i067/test_i067.c b/api-tests/ff/ipc/test_i067/test_i067.c
index 04589b9..de82348 100644
--- a/api-tests/ff/ipc/test_i067/test_i067.c
+++ b/api-tests/ff/ipc/test_i067/test_i067.c
@@ -36,7 +36,7 @@
     NULL,
 };
 
-int32_t client_test_dynamic_mem_alloc_fn(caller_security_t caller)
+int32_t client_test_dynamic_mem_alloc_fn(caller_security_t caller __UNUSED)
 {
   /* Check heap memory support available to secure partition */
 #ifdef SP_HEAP_MEM_SUPP
diff --git a/api-tests/ff/ipc/test_i068/test_i068.c b/api-tests/ff/ipc/test_i068/test_i068.c
index 948c1bf..b4d64b5 100644
--- a/api-tests/ff/ipc/test_i068/test_i068.c
+++ b/api-tests/ff/ipc/test_i068/test_i068.c
@@ -44,10 +44,8 @@
    char *src = (char *)data;
    char *dest = (char *)addr;
 
-   for (i = 0; i < l; i++)
-   {
+   for (i = 0; i < (int)l; i++)
        dest[i] = src[i];
-   }
 }
 
 /* Empty function to create opcode data set */
@@ -55,7 +53,7 @@
 {
 }
 
-int32_t client_test_instr_exec_from_writable_mem(caller_security_t caller)
+int32_t client_test_instr_exec_from_writable_mem(caller_security_t caller __UNUSED)
 {
   val->print(PRINT_TEST, "[Check 1] Test Instr execution from writable memory\n", 0);
 
diff --git a/api-tests/ff/ipc/test_i069/test_i069.c b/api-tests/ff/ipc/test_i069/test_i069.c
index 2dff728..a6e53f1 100644
--- a/api-tests/ff/ipc/test_i069/test_i069.c
+++ b/api-tests/ff/ipc/test_i069/test_i069.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_write_to_code_space(caller_security_t caller)
+int32_t client_test_write_to_code_space(caller_security_t caller __UNUSED)
 {
   int32_t *p;
 
diff --git a/api-tests/ff/ipc/test_i070/test_i070.c b/api-tests/ff/ipc/test_i070/test_i070.c
index da11bf8..aa53f63 100644
--- a/api-tests/ff/ipc/test_i070/test_i070.c
+++ b/api-tests/ff/ipc/test_i070/test_i070.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_write_to_const_data(caller_security_t caller)
+int32_t client_test_write_to_const_data(caller_security_t caller __UNUSED)
 {
   const char *string = "This text should be in RO space";
   char       *p;
diff --git a/api-tests/ff/ipc/test_i071/test_i071.c b/api-tests/ff/ipc/test_i071/test_i071.c
index a65721c..84b983b 100644
--- a/api-tests/ff/ipc/test_i071/test_i071.c
+++ b/api-tests/ff/ipc/test_i071/test_i071.c
@@ -33,7 +33,7 @@
     NULL,
 };
 
-int32_t client_test_mem_manipulation_fn(caller_security_t caller)
+int32_t client_test_mem_manipulation_fn(caller_security_t caller __UNUSED)
 {
   uint8_t    buffer[BUFF_SIZE] = {0};
   uint8_t    buffer1[BUFF_SIZE] = {0};
diff --git a/api-tests/ff/ipc/test_i072/test_i072.c b/api-tests/ff/ipc/test_i072/test_i072.c
index 263b84c..ec77eb0 100644
--- a/api-tests/ff/ipc/test_i072/test_i072.c
+++ b/api-tests/ff/ipc/test_i072/test_i072.c
@@ -57,7 +57,7 @@
    return VAL_STATUS_SUCCESS;
 }
 
-int32_t client_test_nspe_read_app_rot_variable(caller_security_t caller)
+int32_t client_test_nspe_read_app_rot_variable(caller_security_t caller __UNUSED)
 {
    addr_t   app_rot_addr;
    uint32_t data = 0x1234;
@@ -95,7 +95,7 @@
    return VAL_STATUS_SPM_FAILED;
 }
 
-int32_t client_test_nspe_write_app_rot_variable(caller_security_t caller)
+int32_t client_test_nspe_write_app_rot_variable(caller_security_t caller __UNUSED)
 {
    addr_t   app_rot_addr;
    uint32_t data = 0x1234;
diff --git a/api-tests/ff/ipc/test_i073/test_i073.c b/api-tests/ff/ipc/test_i073/test_i073.c
index 298b939..99e6448 100644
--- a/api-tests/ff/ipc/test_i073/test_i073.c
+++ b/api-tests/ff/ipc/test_i073/test_i073.c
@@ -57,7 +57,7 @@
    return VAL_STATUS_SUCCESS;
 }
 
-int32_t client_test_nspe_read_app_rot_stack(caller_security_t caller)
+int32_t client_test_nspe_read_app_rot_stack(caller_security_t caller __UNUSED)
 {
    addr_t   app_rot_addr;
    uint32_t data = 0x1234;
@@ -95,7 +95,7 @@
    return VAL_STATUS_SPM_FAILED;
 }
 
-int32_t client_test_nspe_write_app_rot_stack(caller_security_t caller)
+int32_t client_test_nspe_write_app_rot_stack(caller_security_t caller __UNUSED)
 {
    addr_t   app_rot_addr;
    uint32_t data = 0x1234;
diff --git a/api-tests/ff/ipc/test_i074/test_i074.c b/api-tests/ff/ipc/test_i074/test_i074.c
index bc5cf39..85bbdbb 100644
--- a/api-tests/ff/ipc/test_i074/test_i074.c
+++ b/api-tests/ff/ipc/test_i074/test_i074.c
@@ -62,7 +62,7 @@
    return VAL_STATUS_SUCCESS;
 }
 
-int32_t client_test_nspe_read_app_rot_heap(caller_security_t caller)
+int32_t client_test_nspe_read_app_rot_heap(caller_security_t caller __UNUSED)
 {
    addr_t   app_rot_addr;
    uint8_t  data = DATA_VALUE;
@@ -100,7 +100,7 @@
    return VAL_STATUS_SPM_FAILED;
 }
 
-int32_t client_test_nspe_write_app_rot_heap(caller_security_t caller)
+int32_t client_test_nspe_write_app_rot_heap(caller_security_t caller __UNUSED)
 {
    addr_t   app_rot_addr;
    uint8_t  data = DATA_VALUE;
@@ -131,14 +131,14 @@
    return VAL_STATUS_SUCCESS;
 }
 #else
-int32_t client_test_nspe_read_app_rot_heap(caller_security_t caller)
+int32_t client_test_nspe_read_app_rot_heap(caller_security_t caller __UNUSED)
 {
    val->print(PRINT_TEST, "[Check 1] Test NSPE reading APP-RoT heap\n", 0);
    val->print(PRINT_ERROR, "\tSkipping test as heap memory not supported\n", 0);
    return RESULT_SKIP(VAL_STATUS_HEAP_NOT_AVAILABLE);
 }
 
-int32_t client_test_nspe_write_app_rot_heap(caller_security_t caller)
+int32_t client_test_nspe_write_app_rot_heap(caller_security_t caller __UNUSED)
 {
    val->print(PRINT_TEST, "[Check 2] Test NSPE writing APP-RoT heap\n", 0);
    val->print(PRINT_ERROR, "\tSkipping test as heap memory not supported\n", 0);
diff --git a/api-tests/ff/ipc/test_i075/test_i075.c b/api-tests/ff/ipc/test_i075/test_i075.c
index b794f64..fc5dcce 100644
--- a/api-tests/ff/ipc/test_i075/test_i075.c
+++ b/api-tests/ff/ipc/test_i075/test_i075.c
@@ -59,7 +59,7 @@
    return VAL_STATUS_SUCCESS;
 }
 
-int32_t client_test_nspe_read_app_rot_mmio(caller_security_t caller)
+int32_t client_test_nspe_read_app_rot_mmio(caller_security_t caller __UNUSED)
 {
    addr_t   app_rot_addr;
    uint32_t data = DATA_VALUE;
@@ -97,7 +97,7 @@
    return VAL_STATUS_SPM_FAILED;
 }
 
-int32_t client_test_nspe_write_app_rot_mmio(caller_security_t caller)
+int32_t client_test_nspe_write_app_rot_mmio(caller_security_t caller __UNUSED)
 {
    addr_t   app_rot_addr;
    uint32_t data = DATA_VALUE;
diff --git a/api-tests/ff/ipc/test_i076/test_i076.c b/api-tests/ff/ipc/test_i076/test_i076.c
index 4af1f64..485c451 100644
--- a/api-tests/ff/ipc/test_i076/test_i076.c
+++ b/api-tests/ff/ipc/test_i076/test_i076.c
@@ -71,7 +71,7 @@
    psa->close(*handle);
 }
 
-int32_t client_test_nspe_read_psa_rot_variable(caller_security_t caller)
+int32_t client_test_nspe_read_psa_rot_variable(caller_security_t caller __UNUSED)
 {
    addr_t       psa_rot_addr;
    uint32_t     data = DATA_VALUE1;
@@ -114,7 +114,7 @@
    return VAL_STATUS_SPM_FAILED;
 }
 
-int32_t client_test_nspe_write_psa_rot_variable(caller_security_t caller)
+int32_t client_test_nspe_write_psa_rot_variable(caller_security_t caller __UNUSED)
 {
    addr_t       psa_rot_addr;
    uint32_t     data = DATA_VALUE1;
diff --git a/api-tests/ff/ipc/test_i077/test_i077.c b/api-tests/ff/ipc/test_i077/test_i077.c
index 7ce34b7..42f204b 100644
--- a/api-tests/ff/ipc/test_i077/test_i077.c
+++ b/api-tests/ff/ipc/test_i077/test_i077.c
@@ -72,7 +72,7 @@
 }
 
 
-int32_t client_test_nspe_read_psa_rot_stack(caller_security_t caller)
+int32_t client_test_nspe_read_psa_rot_stack(caller_security_t caller __UNUSED)
 {
    addr_t       psa_rot_addr;
    uint32_t     data = DATA_VALUE1;
@@ -115,7 +115,7 @@
    return VAL_STATUS_SPM_FAILED;
 }
 
-int32_t client_test_nspe_write_psa_rot_stack(caller_security_t caller)
+int32_t client_test_nspe_write_psa_rot_stack(caller_security_t caller __UNUSED)
 {
    addr_t       psa_rot_addr;
    uint32_t     data = DATA_VALUE1;
diff --git a/api-tests/ff/ipc/test_i078/test_i078.c b/api-tests/ff/ipc/test_i078/test_i078.c
index 2f97ed9..2e257d9 100644
--- a/api-tests/ff/ipc/test_i078/test_i078.c
+++ b/api-tests/ff/ipc/test_i078/test_i078.c
@@ -74,7 +74,7 @@
    psa->close(*handle);
 }
 
-int32_t client_test_nspe_read_psa_rot_heap(caller_security_t caller)
+int32_t client_test_nspe_read_psa_rot_heap(caller_security_t caller __UNUSED)
 {
    addr_t       psa_rot_addr;
    uint8_t      data = DATA_VALUE;
@@ -117,7 +117,7 @@
    return VAL_STATUS_SPM_FAILED;
 }
 
-int32_t client_test_nspe_write_psa_rot_heap(caller_security_t caller)
+int32_t client_test_nspe_write_psa_rot_heap(caller_security_t caller __UNUSED)
 {
    addr_t       psa_rot_addr;
    uint8_t      data = DATA_VALUE;
@@ -146,14 +146,14 @@
    return VAL_STATUS_SUCCESS;
 }
 #else
-int32_t client_test_nspe_read_psa_rot_heap(caller_security_t caller)
+int32_t client_test_nspe_read_psa_rot_heap(caller_security_t caller __UNUSED)
 {
    val->print(PRINT_TEST, "[Check 1] Test NSPE reading PSA-RoT heap\n", 0);
    val->print(PRINT_ERROR, "\tSkipping test as heap memory not supported\n", 0);
    return RESULT_SKIP(VAL_STATUS_HEAP_NOT_AVAILABLE);
 }
 
-int32_t client_test_nspe_write_psa_rot_heap(caller_security_t caller)
+int32_t client_test_nspe_write_psa_rot_heap(caller_security_t caller __UNUSED)
 {
    val->print(PRINT_TEST, "[Check 2] Test NSPE writing PSA-RoT heap\n", 0);
    val->print(PRINT_ERROR, "\tSkipping test as heap memory not supported\n", 0);
diff --git a/api-tests/ff/ipc/test_i079/test_i079.c b/api-tests/ff/ipc/test_i079/test_i079.c
index 653ef91..995e850 100644
--- a/api-tests/ff/ipc/test_i079/test_i079.c
+++ b/api-tests/ff/ipc/test_i079/test_i079.c
@@ -71,7 +71,7 @@
    psa->close(*handle);
 }
 
-int32_t client_test_nspe_read_psa_rot_mmio(caller_security_t caller)
+int32_t client_test_nspe_read_psa_rot_mmio(caller_security_t caller __UNUSED)
 {
    addr_t       psa_rot_addr;
    uint32_t     data = DATA_VALUE;
@@ -114,7 +114,7 @@
    return VAL_STATUS_SPM_FAILED;
 }
 
-int32_t client_test_nspe_write_psa_rot_mmio(caller_security_t caller)
+int32_t client_test_nspe_write_psa_rot_mmio(caller_security_t caller __UNUSED)
 {
    addr_t       psa_rot_addr;
    uint32_t     data = DATA_VALUE;
diff --git a/api-tests/ff/ipc/test_i080/test_i080.c b/api-tests/ff/ipc/test_i080/test_i080.c
index 5947f25..1fd25f6 100644
--- a/api-tests/ff/ipc/test_i080/test_i080.c
+++ b/api-tests/ff/ipc/test_i080/test_i080.c
@@ -71,7 +71,7 @@
    psa->close(*handle);
 }
 
-int32_t client_test_app_rot_read_psa_rot_variable(caller_security_t caller)
+int32_t client_test_app_rot_read_psa_rot_variable(caller_security_t caller __UNUSED)
 {
    addr_t       psa_rot_addr;
    uint32_t     data = DATA_VALUE1;
@@ -114,7 +114,7 @@
    return VAL_STATUS_SPM_FAILED;
 }
 
-int32_t client_test_app_rot_write_psa_rot_variable(caller_security_t caller)
+int32_t client_test_app_rot_write_psa_rot_variable(caller_security_t caller __UNUSED)
 {
    addr_t       psa_rot_addr;
    uint32_t     data = DATA_VALUE1;
diff --git a/api-tests/ff/ipc/test_i081/test_i081.c b/api-tests/ff/ipc/test_i081/test_i081.c
index 65ba121..5f12593 100644
--- a/api-tests/ff/ipc/test_i081/test_i081.c
+++ b/api-tests/ff/ipc/test_i081/test_i081.c
@@ -72,7 +72,7 @@
 }
 
 
-int32_t client_test_app_rot_read_psa_rot_stack(caller_security_t caller)
+int32_t client_test_app_rot_read_psa_rot_stack(caller_security_t caller __UNUSED)
 {
    addr_t       psa_rot_addr;
    uint32_t     data = DATA_VALUE1;
@@ -115,7 +115,7 @@
    return VAL_STATUS_SPM_FAILED;
 }
 
-int32_t client_test_app_rot_write_psa_rot_stack(caller_security_t caller)
+int32_t client_test_app_rot_write_psa_rot_stack(caller_security_t caller __UNUSED)
 {
    addr_t       psa_rot_addr;
    uint32_t     data = DATA_VALUE1;
diff --git a/api-tests/ff/ipc/test_i082/test_i082.c b/api-tests/ff/ipc/test_i082/test_i082.c
index ba015c4..6e56975 100644
--- a/api-tests/ff/ipc/test_i082/test_i082.c
+++ b/api-tests/ff/ipc/test_i082/test_i082.c
@@ -74,7 +74,7 @@
    psa->close(*handle);
 }
 
-int32_t client_test_app_rot_read_psa_rot_heap(caller_security_t caller)
+int32_t client_test_app_rot_read_psa_rot_heap(caller_security_t caller __UNUSED)
 {
    addr_t       psa_rot_addr;
    uint8_t      data = DATA_VALUE;
@@ -117,7 +117,7 @@
    return VAL_STATUS_SPM_FAILED;
 }
 
-int32_t client_test_app_rot_write_psa_rot_heap(caller_security_t caller)
+int32_t client_test_app_rot_write_psa_rot_heap(caller_security_t caller __UNUSED)
 {
    addr_t       psa_rot_addr;
    uint8_t      data = DATA_VALUE;
@@ -146,14 +146,14 @@
    return VAL_STATUS_SUCCESS;
 }
 #else
-int32_t client_test_app_rot_read_psa_rot_heap(caller_security_t caller)
+int32_t client_test_app_rot_read_psa_rot_heap(caller_security_t caller __UNUSED)
 {
    val->print(PRINT_TEST, "[Check 1] Test APP-RoT reading PSA-RoT heap\n", 0);
    val->print(PRINT_ERROR, "\tSkipping test as heap memory not supported\n", 0);
    return RESULT_SKIP(VAL_STATUS_HEAP_NOT_AVAILABLE);
 }
 
-int32_t client_test_app_rot_write_psa_rot_heap(caller_security_t caller)
+int32_t client_test_app_rot_write_psa_rot_heap(caller_security_t caller __UNUSED)
 {
    val->print(PRINT_TEST, "[Check 2] Test APP-RoT writing PSA-RoT heap\n", 0);
    val->print(PRINT_ERROR, "\tSkipping test as heap memory not supported\n", 0);
diff --git a/api-tests/ff/ipc/test_i083/test_i083.c b/api-tests/ff/ipc/test_i083/test_i083.c
index fba4ce2..477f91e 100644
--- a/api-tests/ff/ipc/test_i083/test_i083.c
+++ b/api-tests/ff/ipc/test_i083/test_i083.c
@@ -71,7 +71,7 @@
    psa->close(*handle);
 }
 
-int32_t client_test_app_rot_read_psa_rot_mmio(caller_security_t caller)
+int32_t client_test_app_rot_read_psa_rot_mmio(caller_security_t caller __UNUSED)
 {
    addr_t       psa_rot_addr;
    uint32_t     data = DATA_VALUE;
@@ -114,7 +114,7 @@
    return VAL_STATUS_SPM_FAILED;
 }
 
-int32_t client_test_app_rot_write_psa_rot_mmio(caller_security_t caller)
+int32_t client_test_app_rot_write_psa_rot_mmio(caller_security_t caller __UNUSED)
 {
    addr_t       psa_rot_addr;
    uint32_t     data = DATA_VALUE;
diff --git a/api-tests/ff/ipc/test_i084/test_i084.c b/api-tests/ff/ipc/test_i084/test_i084.c
index f50650e..50afc94 100644
--- a/api-tests/ff/ipc/test_i084/test_i084.c
+++ b/api-tests/ff/ipc/test_i084/test_i084.c
@@ -57,7 +57,7 @@
    return VAL_STATUS_SUCCESS;
 }
 
-int32_t client_test_sp_read_other_sp_variable(caller_security_t caller)
+int32_t client_test_sp_read_other_sp_variable(caller_security_t caller __UNUSED)
 {
    addr_t   app_rot_addr;
    uint32_t data = 0x1234;
@@ -95,7 +95,7 @@
    return VAL_STATUS_SPM_FAILED;
 }
 
-int32_t client_test_sp_write_other_sp_variable(caller_security_t caller)
+int32_t client_test_sp_write_other_sp_variable(caller_security_t caller __UNUSED)
 {
    addr_t   app_rot_addr;
    uint32_t data = 0x1234;
diff --git a/api-tests/ff/ipc/test_i085/test_i085.c b/api-tests/ff/ipc/test_i085/test_i085.c
index 2900785..9a3647e 100644
--- a/api-tests/ff/ipc/test_i085/test_i085.c
+++ b/api-tests/ff/ipc/test_i085/test_i085.c
@@ -57,7 +57,7 @@
    return VAL_STATUS_SUCCESS;
 }
 
-int32_t client_test_sp_read_other_sp_stack(caller_security_t caller)
+int32_t client_test_sp_read_other_sp_stack(caller_security_t caller __UNUSED)
 {
    addr_t   app_rot_addr;
    uint32_t data = 0x1234;
@@ -95,7 +95,7 @@
    return VAL_STATUS_SPM_FAILED;
 }
 
-int32_t client_test_sp_write_other_sp_stack(caller_security_t caller)
+int32_t client_test_sp_write_other_sp_stack(caller_security_t caller __UNUSED)
 {
    addr_t   app_rot_addr;
    uint32_t data = 0x1234;
diff --git a/api-tests/ff/ipc/test_i086/test_i086.c b/api-tests/ff/ipc/test_i086/test_i086.c
index 82017ec..2cb9ce6 100644
--- a/api-tests/ff/ipc/test_i086/test_i086.c
+++ b/api-tests/ff/ipc/test_i086/test_i086.c
@@ -62,7 +62,7 @@
    return VAL_STATUS_SUCCESS;
 }
 
-int32_t client_test_sp_read_other_sp_heap(caller_security_t caller)
+int32_t client_test_sp_read_other_sp_heap(caller_security_t caller __UNUSED)
 {
    addr_t   app_rot_addr;
    uint8_t  data = DATA_VALUE;
@@ -100,7 +100,7 @@
    return VAL_STATUS_SPM_FAILED;
 }
 
-int32_t client_test_sp_write_other_sp_heap(caller_security_t caller)
+int32_t client_test_sp_write_other_sp_heap(caller_security_t caller __UNUSED)
 {
    addr_t   app_rot_addr;
    uint8_t  data = DATA_VALUE;
@@ -131,14 +131,14 @@
    return VAL_STATUS_SUCCESS;
 }
 #else
-int32_t client_test_sp_read_other_sp_heap(caller_security_t caller)
+int32_t client_test_sp_read_other_sp_heap(caller_security_t caller __UNUSED)
 {
    val->print(PRINT_TEST, "[Check 1] Test SP reading other SP heap\n", 0);
    val->print(PRINT_ERROR, "\tSkipping test as heap memory not supported\n", 0);
    return RESULT_SKIP(VAL_STATUS_HEAP_NOT_AVAILABLE);
 }
 
-int32_t client_test_sp_write_other_sp_heap(caller_security_t caller)
+int32_t client_test_sp_write_other_sp_heap(caller_security_t caller __UNUSED)
 {
    val->print(PRINT_TEST, "[Check 2] Test SP writing other SP heap\n", 0);
    val->print(PRINT_ERROR, "\tSkipping test as heap memory not supported\n", 0);
diff --git a/api-tests/ff/ipc/test_i087/test_i087.c b/api-tests/ff/ipc/test_i087/test_i087.c
index 602424a..90d39cb 100644
--- a/api-tests/ff/ipc/test_i087/test_i087.c
+++ b/api-tests/ff/ipc/test_i087/test_i087.c
@@ -59,7 +59,7 @@
    return VAL_STATUS_SUCCESS;
 }
 
-int32_t client_test_sp_read_other_sp_mmio(caller_security_t caller)
+int32_t client_test_sp_read_other_sp_mmio(caller_security_t caller __UNUSED)
 {
    addr_t   app_rot_addr;
    uint32_t data = DATA_VALUE;
@@ -97,7 +97,7 @@
    return VAL_STATUS_SPM_FAILED;
 }
 
-int32_t client_test_sp_write_other_sp_mmio(caller_security_t caller)
+int32_t client_test_sp_write_other_sp_mmio(caller_security_t caller __UNUSED)
 {
    addr_t   app_rot_addr;
    uint32_t data = DATA_VALUE;
diff --git a/api-tests/ff/ipc/test_i089/test_i089.c b/api-tests/ff/ipc/test_i089/test_i089.c
index 619d5be..d101c3b 100644
--- a/api-tests/ff/ipc/test_i089/test_i089.c
+++ b/api-tests/ff/ipc/test_i089/test_i089.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_panic(caller_security_t caller)
+int32_t client_test_psa_panic(caller_security_t caller __UNUSED)
 {
    return VAL_STATUS_SUCCESS;
 }
diff --git a/api-tests/ff/ipc/test_l088/test_l088.c b/api-tests/ff/ipc/test_l088/test_l088.c
index 0dcb164..237637c 100644
--- a/api-tests/ff/ipc/test_l088/test_l088.c
+++ b/api-tests/ff/ipc/test_l088/test_l088.c
@@ -31,7 +31,7 @@
     NULL,
 };
 
-int32_t client_test_psa_rot_lifecycle_state(caller_security_t caller)
+int32_t client_test_psa_rot_lifecycle_state(caller_security_t caller __UNUSED)
 {
    return VAL_STATUS_SUCCESS;
 }
diff --git a/api-tests/ff/partition/driver_partition.c b/api-tests/ff/partition/driver_partition.c
index 549b5c4..c61cf98 100644
--- a/api-tests/ff/partition/driver_partition.c
+++ b/api-tests/ff/partition/driver_partition.c
@@ -590,6 +590,8 @@
     psa_write(msg->handle, 0, (void *) &buffer, BUFFER_SIZE);
     psa_reply(msg->handle, PSA_SUCCESS);
     free(buffer);
+#else
+    (void)msg;
 #endif
 }
 
@@ -638,6 +640,8 @@
         psa_reply(msg->handle, -2);
     }
     free(buffer);
+#else
+    (void)msg;
 #endif
 }
 
diff --git a/api-tests/platform/targets/common/nspe/crypto/pal_crypto_intf.c b/api-tests/platform/targets/common/nspe/crypto/pal_crypto_intf.c
index 6c8f269..6776d4f 100644
--- a/api-tests/platform/targets/common/nspe/crypto/pal_crypto_intf.c
+++ b/api-tests/platform/targets/common/nspe/crypto/pal_crypto_intf.c
@@ -70,7 +70,7 @@
             return status;
         case PAL_CRYPTO_SET_KEY_TYPE:
             attributes = va_arg(valist, psa_key_attributes_t *);
-            key_type = va_arg(valist, psa_key_type_t);
+            key_type = (psa_key_type_t)va_arg(valist, int);
             psa_set_key_type(attributes, key_type);
             return 0;
         case PAL_CRYPTO_SET_KEY_BITS:
diff --git a/api-tests/platform/targets/common/nspe/initial_attestation/pal_attestation_crypto.c b/api-tests/platform/targets/common/nspe/initial_attestation/pal_attestation_crypto.c
index 91be54d..f7ea494 100644
--- a/api-tests/platform/targets/common/nspe/initial_attestation/pal_attestation_crypto.c
+++ b/api-tests/platform/targets/common/nspe/initial_attestation/pal_attestation_crypto.c
@@ -323,6 +323,8 @@
     int32_t status = PAL_ATTEST_ERROR;
     psa_algorithm_t key_alg = PSA_ALG_ECDSA(PSA_ALG_SHA_256);
 
+    (void)cose_algorithm_id;
+
     /* Register the attestation public key */
     status = pal_import_attest_key(key_alg);
     if (status != PAL_ATTEST_SUCCESS)
diff --git a/api-tests/platform/targets/tgt_dev_apis_stdc/nspe/main.c b/api-tests/platform/targets/tgt_dev_apis_stdc/nspe/main.c
index 34c28e1..a503b6e 100644
--- a/api-tests/platform/targets/tgt_dev_apis_stdc/nspe/main.c
+++ b/api-tests/platform/targets/tgt_dev_apis_stdc/nspe/main.c
@@ -27,5 +27,7 @@
 **/
 int main(int argc, char **argv)
 {
+    (void)argc;
+    (void)argv;
     return val_entry();
 }
diff --git a/api-tests/platform/targets/tgt_dev_apis_stdc/nspe/pal_config.h b/api-tests/platform/targets/tgt_dev_apis_stdc/nspe/pal_config.h
index 01514c3..df6cef0 100644
--- a/api-tests/platform/targets/tgt_dev_apis_stdc/nspe/pal_config.h
+++ b/api-tests/platform/targets/tgt_dev_apis_stdc/nspe/pal_config.h
@@ -88,12 +88,12 @@
 #include "psa/crypto.h"
 #endif
 
-#ifdef INTERNAL_TRUSTED_STORAGE
+#if defined(INTERNAL_TRUSTED_STORAGE) || defined(STORAGE)
 /* psa/internal_trusted_storage.h: Contains the PSA ITS API elements */
 #include "psa/internal_trusted_storage.h"
 #endif
 
-#ifdef PROTECTED_STORAGE
+#if defined(PROTECTED_STORAGE) || defined(STORAGE)
 /* psa/protected_storage.h: Contains the PSA PS API elements */
 #include "psa/protected_storage.h"
 #endif
diff --git a/api-tests/platform/targets/tgt_dev_apis_stdc/nspe/pal_driver_intf.c b/api-tests/platform/targets/tgt_dev_apis_stdc/nspe/pal_driver_intf.c
index 4fb961a..e91e160 100644
--- a/api-tests/platform/targets/tgt_dev_apis_stdc/nspe/pal_driver_intf.c
+++ b/api-tests/platform/targets/tgt_dev_apis_stdc/nspe/pal_driver_intf.c
@@ -48,25 +48,15 @@
 static int nvmem_check_bounds(addr_t base, uint32_t offset, int size)
 {
     if (base != NVMEM_BASE)
-    {
         return PAL_STATUS_ERROR;
-    }
     if (offset > NVMEM_SIZE)
-    {
         return PAL_STATUS_ERROR;
-    }
     if (size < 0)
-    {
         return PAL_STATUS_ERROR;
-    }
-    if (offset > INT_MAX - size)
-    {
+    if (offset > (uint32_t)(INT_MAX - size))
         return PAL_STATUS_ERROR;
-    }
     if (offset + size > NVMEM_SIZE)
-    {
         return PAL_STATUS_ERROR;
-    }
     return PAL_STATUS_SUCCESS;
 }
 
@@ -117,6 +107,7 @@
 **/
 int pal_uart_init_ns(uint32_t uart_base_addr)
 {
+    (void)uart_base_addr;
     return PAL_STATUS_SUCCESS;
 }
 
@@ -151,6 +142,9 @@
 **/
 int pal_wd_timer_init_ns(addr_t base_addr, uint32_t time_us, uint32_t timer_tick_us)
 {
+    (void)base_addr;
+    (void)time_us;
+    (void)timer_tick_us;
     return PAL_STATUS_SUCCESS;
 }
 
@@ -164,6 +158,7 @@
 **/
 int pal_wd_timer_enable_ns(addr_t base_addr)
 {
+    (void)base_addr;
     return PAL_STATUS_SUCCESS;
 }
 
@@ -177,6 +172,7 @@
 **/
 int pal_wd_timer_disable_ns(addr_t base_addr)
 {
+    (void)base_addr;
     return PAL_STATUS_SUCCESS;
 }
 
diff --git a/api-tests/tools/cmake/compiler/ARMCLANG.cmake b/api-tests/tools/cmake/compiler/ARMCLANG.cmake
index d96dc9d..119ab6c 100644
--- a/api-tests/tools/cmake/compiler/ARMCLANG.cmake
+++ b/api-tests/tools/cmake/compiler/ARMCLANG.cmake
@@ -58,6 +58,6 @@
 	set(TARGET_SWITCH "-march=armv8-m.base -mcmse")
 endif()
 
-set(CMAKE_C_FLAGS              "--target=arm-arm-none-eabi ${TARGET_SWITCH} -Wall -Werror -fshort-enums -fshort-wchar -funsigned-char -fdata-sections -ffunction-sections -mno-unaligned-access -mfpu=none")
+set(CMAKE_C_FLAGS              "--target=arm-arm-none-eabi ${TARGET_SWITCH} -Wall -Werror -Wextra -fshort-enums -fshort-wchar -funsigned-char -fdata-sections -ffunction-sections -mno-unaligned-access -mfpu=none")
 set(CMAKE_ASM_FLAGS            "${TARGET_SWITCH} -mthumb")
 set(CMAKE_EXE_LINKER_FLAGS     "--strict --map --symbols --xref  --info=summarysizes,sizes,totals,unused,veneers --diag_warning=L6204")
diff --git a/api-tests/tools/cmake/compiler/GNUARM.cmake b/api-tests/tools/cmake/compiler/GNUARM.cmake
index cede575..62a0b76 100644
--- a/api-tests/tools/cmake/compiler/GNUARM.cmake
+++ b/api-tests/tools/cmake/compiler/GNUARM.cmake
@@ -58,6 +58,6 @@
 	set(TARGET_SWITCH "-march=armv8-m.base -mcmse")
 endif()
 
-set(CMAKE_C_FLAGS          "${TARGET_SWITCH}  -Wall -Werror -fdata-sections -ffunction-sections -mno-unaligned-access")
+set(CMAKE_C_FLAGS          "${TARGET_SWITCH}  -Wall -Werror -Wextra -fdata-sections -ffunction-sections -mno-unaligned-access")
 set(CMAKE_ASM_FLAGS        "${TARGET_SWITCH} -mthumb")
 set(CMAKE_EXE_LINKER_FLAGS "-Xlinker --fatal-warnings -Xlinker --gc-sections -z max-page-size=0x400 -lgcc -lc -lnosys")
diff --git a/api-tests/tools/scripts/target_cfg/targetConfigGen.py b/api-tests/tools/scripts/target_cfg/targetConfigGen.py
index fd1f7e4..bfa8e30 100644
--- a/api-tests/tools/scripts/target_cfg/targetConfigGen.py
+++ b/api-tests/tools/scripts/target_cfg/targetConfigGen.py
@@ -123,7 +123,7 @@
 			o_f.write("\tfprintf(fp, \"#define _%s_H_\\n\");\n\n" %(temp_out_file[:temp_out_file.find('.')].upper()))
 			if section_name:
 				o_f.write("\tfprintf(fp, \"__attribute__((section(\\\"%s\\\")))\\n\");\n" %(section_name))
-			o_f.write("\tfprintf(fp, \"const uint32_t static %s[] = {\\n\");\n" %(table_name))
+			o_f.write("\tfprintf(fp, \"static const uint32_t %s[] = {\\n\");\n" %(table_name))
 			o_f.write("\tfprintf(fp, \"0x%x\", \'T\');\n")
 			o_f.write("\tfprintf(fp, \"%x\", \'B\');\n")
 			o_f.write("\tfprintf(fp, \"%x\", \'S\');\n")
diff --git a/api-tests/val/common/val_target.c b/api-tests/val/common/val_target.c
index f6561f8..fab15c7 100644
--- a/api-tests/val/common/val_target.c
+++ b/api-tests/val/common/val_target.c
@@ -79,6 +79,8 @@
     val_status_t    status;
     void            *config_blob = NULL;
 
+    (void)size;
+
     val_print(PRINT_INFO, "\tInput id is %x \n", cfg_id);
     do
     {
@@ -133,7 +135,7 @@
 {
     val_status_t status;
 
-    if ((cfg_id < TARGET_MIN_CFG_ID) || (cfg_id > TARGET_MAX_CFG_ID))
+    if ((cfg_id < (cfg_id_t)TARGET_MIN_CFG_ID) || (cfg_id > (cfg_id_t)TARGET_MAX_CFG_ID))
     {
         val_print(PRINT_ERROR, "\tInvalid Target data config ID = %x \n", cfg_id);
         return VAL_STATUS_INSUFFICIENT_SIZE;
diff --git a/api-tests/val/nspe/val_attestation.c b/api-tests/val/nspe/val_attestation.c
index 4b7a137..3ab9505 100644
--- a/api-tests/val/nspe/val_attestation.c
+++ b/api-tests/val/nspe/val_attestation.c
@@ -97,7 +97,7 @@
 }
 
 static int parse_unprotected_headers(QCBORDecodeContext *decode_context,
-                                     struct q_useful_buf_c *child)
+                                     struct q_useful_buf_c *child __UNUSED)
 {
     struct items_to_get_t   item_list[3];
 
@@ -430,6 +430,7 @@
     va_end(valist);
     return status;
 #else
+    (void)type;
     return VAL_STATUS_ERROR;
 #endif /* INITIAL_ATTESTATION */
 }
diff --git a/api-tests/val/nspe/val_crypto.c b/api-tests/val/nspe/val_crypto.c
index 8af2eb5..66e3041 100644
--- a/api-tests/val/nspe/val_crypto.c
+++ b/api-tests/val/nspe/val_crypto.c
@@ -38,6 +38,7 @@
     va_end(valist);
     return status;
 #else
+    (void)type;
     return VAL_STATUS_ERROR;
 #endif
 }
diff --git a/api-tests/val/nspe/val_dispatcher.c b/api-tests/val/nspe/val_dispatcher.c
index 8debcac..faf10d6 100644
--- a/api-tests/val/nspe/val_dispatcher.c
+++ b/api-tests/val/nspe/val_dispatcher.c
@@ -42,7 +42,7 @@
                                   {VAL_INVALID_TEST_ID, NULL}
                                   };
 
-    for (i = 0; i < (sizeof(test_list)/sizeof(test_list[0])); i++)
+    for (i = 0; i < (int)(sizeof(test_list)/sizeof(test_list[0])); i++)
     {
         if (test_id_prev == VAL_INVALID_TEST_ID)
         {
diff --git a/api-tests/val/nspe/val_framework.c b/api-tests/val/nspe/val_framework.c
index 2438912..9e7df32 100644
--- a/api-tests/val/nspe/val_framework.c
+++ b/api-tests/val/nspe/val_framework.c
@@ -110,6 +110,8 @@
     test_info_t           test_info;
 
     test_info.test_num = test_num;
+#else
+   (void)test_num;
 #endif
 
     status = val_get_boot_flag(&boot.state);
@@ -572,7 +574,7 @@
 
     val_print(PRINT_INFO, "\n\tboot.state=0x%x", boot.state);
 
-    for (i = 0; i < (sizeof(boot_state)/sizeof(boot_state[0])); i++)
+    for (i = 0; i < (int)(sizeof(boot_state)/sizeof(boot_state[0])); i++)
     {
         if (boot.state == boot_state[i])
         {
diff --git a/api-tests/val/nspe/val_storage.c b/api-tests/val/nspe/val_storage.c
index bc2cc2d..edf852d 100644
--- a/api-tests/val/nspe/val_storage.c
+++ b/api-tests/val/nspe/val_storage.c
@@ -63,6 +63,7 @@
     va_end(valist);
     return status;
 #else
+    (void)type;
     return VAL_STATUS_ERROR;
 #endif
 }