commit d49d0774705c20ac79ee6cd2ab5e9bc864038f99
author Daniel Boulby <daniel.boulby@arm.com> Wed Jan 15 11:19:36 2025 +0000
committer Joao Alves <joao.alves@arm.com> Tue Feb 25 16:07:42 2025 +0100
tree d3b344b971dbba932f33ea856145a5b274131f13
parent 867d418705ebf922fd2f039c625a3affc4c35775

refactor(interrupts): remove api_interrupt_inject

api_interrupt_inject and vcpu_interrupt_inject were performing the
same function, as the next argument was never being used. So just
use vcpu_interrupt_inject.

Also remove unnecessary if statement from vcpu_interrupt_inject.

Signed-off-by: Daniel Boulby <daniel.boulby@arm.com>
Change-Id: I36c5157b7961e5a85b3e485f0a309b5dddf7c21a

src/ffa/absent.c

diff --git a/src/ffa/absent.c b/src/ffa/absent.c
index 8258f17..260b3b6 100644
--- a/src/ffa/absent.c
+++ b/src/ffa/absent.c
@@ -372,11 +372,9 @@
 }
 
 bool ffa_interrupts_inject_notification_pending_interrupt(
-	struct vcpu_locked target_locked, struct vcpu_locked current_locked,
-	struct vm_locked receiver_locked)
+	struct vcpu_locked target_locked, struct vm_locked receiver_locked)
 {
 	(void)target_locked;
-	(void)current_locked;
 	(void)receiver_locked;
 
 	return false;

src/ffa/hypervisor/interrupts.c

diff --git a/src/ffa/hypervisor/interrupts.c b/src/ffa/hypervisor/interrupts.c
index 9bae658..8fde3e5 100644
--- a/src/ffa/hypervisor/interrupts.c
+++ b/src/ffa/hypervisor/interrupts.c
@@ -24,11 +24,9 @@
 }
 
 bool ffa_interrupts_inject_notification_pending_interrupt(
-	struct vcpu_locked target_locked, struct vcpu_locked current_locked,
-	struct vm_locked receiver_locked)
+	struct vcpu_locked target_locked, struct vm_locked receiver_locked)
 {
 	(void)target_locked;
-	(void)current_locked;
 	(void)receiver_locked;
 
 	return false;

src/ffa/spmc/interrupts.c

diff --git a/src/ffa/spmc/interrupts.c b/src/ffa/spmc/interrupts.c
index b69a47a..8f0c9ac 100644
--- a/src/ffa/spmc/interrupts.c
+++ b/src/ffa/spmc/interrupts.c
@@ -584,8 +584,7 @@
 }
 
 bool ffa_interrupts_inject_notification_pending_interrupt(
-	struct vcpu_locked target_locked, struct vcpu_locked current_locked,
-	struct vm_locked receiver_locked)
+	struct vcpu_locked target_locked, struct vm_locked receiver_locked)
 {
 	struct vm *next_vm = target_locked.vcpu->vm;
 	bool ret = false;
@@ -602,9 +601,8 @@
 		     receiver_locked, vcpu_index(target_locked.vcpu)) ||
 	     (vm_are_global_notifications_pending(receiver_locked) &&
 	      !vm_notifications_is_npi_injected(receiver_locked)))) {
-		api_interrupt_inject_locked(target_locked,
-					    HF_NOTIFICATION_PENDING_INTID,
-					    current_locked, NULL);
+		vcpu_interrupt_inject(target_locked,
+				      HF_NOTIFICATION_PENDING_INTID);
 		vm_notifications_set_npi_injected(receiver_locked, true);
 		ret = true;
 	}