From d32fac276da9157047f94583de5d56c107eee8ea Mon Sep 17 00:00:00 2001
From: Tom Cosgrove <tom.cosgrove@arm.com>
Date: Fri, 21 Jun 2024 20:28:17 +0100
Subject: [PATCH] psasim: have the generator script check for type = "void"
 rather than name = "(void)"

Signed-off-by: Tom Cosgrove <tom.cosgrove@arm.com>
---
 tests/psa-client-server/psasim/src/psa_sim_generate.pl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/psa-client-server/psasim/src/psa_sim_generate.pl b/tests/psa-client-server/psasim/src/psa_sim_generate.pl
index 5673b677a..a0ee76a80 100755
--- a/tests/psa-client-server/psasim/src/psa_sim_generate.pl
+++ b/tests/psa-client-server/psasim/src/psa_sim_generate.pl
@@ -531,7 +531,7 @@ int ${name}_wrapper(
 {
 EOF
 
-    print $fh <<EOF unless $ret_name eq "(void)";
+    print $fh <<EOF unless $ret_type eq "void";
     $ret_type $ret_name = $ret_default;
 EOF
     # Output the variables we will need when we call the target function
@@ -967,10 +967,11 @@ sub output_call
 {
     my ($fh, $f, $name, $is_server) = @_;
 
+    my $ret_type = $f->{return}->{type};
     my $ret_name = $f->{return}->{name};
     my $args = $f->{args};
 
-    if ($ret_name eq "(void)") {
+    if ($ret_type eq "void") {
         print $fh "\n    $name(\n";
     } else {
         print $fh "\n    $ret_name = $name(\n";