Update RPC init for ITS and PS in psa-api-test

Signed-off-by: Balint Dobszay <balint.dobszay@arm.com>
Change-Id: I8ea37d05ac9a3b055c8186b6bac9742bfa0d6612
diff --git a/deployments/psa-api-test/arch_test_runner.c b/deployments/psa-api-test/arch_test_runner.c
index e8745d8..8fd3dac 100644
--- a/deployments/psa-api-test/arch_test_runner.c
+++ b/deployments/psa-api-test/arch_test_runner.c
@@ -10,9 +10,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "rpc/common/logging/logging_caller.h"
 #include "service_under_test.h"
-#include "service_locator.h"
 
 #define TEST_ID_OFFSET      (5)
 #define TEST_POSTFIX_OFFSET (8)
@@ -118,11 +116,6 @@
 {
     int rval = -1;
     int option_index = 0;
-    struct logging_caller *selected_call_logger = NULL;
-    struct logging_caller call_logger;
-
-    logging_caller_init(&call_logger, stdout);
-    service_locator_init();
 
      /* Print available tests */
     if (option_selected("-l", argc, argv, &option_index)) {
@@ -149,10 +142,6 @@
         pal_set_custom_test_list(test_list_values);
     }
 
-    /* Setup verbose mode */
-    if (option_selected("-v", argc, argv, &option_index))
-        selected_call_logger = &call_logger;
-
     /* Print help */
     if (option_selected("-h", argc, argv, &option_index)) {
         print_help();
@@ -160,7 +149,7 @@
     }
 
     /* Locate service under test */
-    rval = locate_service_under_test(selected_call_logger);
+    rval = locate_service_under_test();
 
     /* Run tests */
     if (!rval) {
@@ -174,7 +163,5 @@
         printf("Failed to locate service under test.  Error code: %d\n", rval);
     }
 
-    logging_caller_deinit(&call_logger);
-
     return rval;
 }