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
diff --git a/inc/hf/api.h b/inc/hf/api.h
index 6b17d42..621161a 100644
--- a/inc/hf/api.h
+++ b/inc/hf/api.h
@@ -42,13 +42,6 @@
int64_t api_interrupt_enable(uint32_t intid, bool enable,
enum interrupt_type type, struct vcpu *current);
uint32_t api_interrupt_get(struct vcpu_locked current_locked);
-int64_t api_interrupt_inject(ffa_id_t target_vm_id,
- ffa_vcpu_index_t target_vcpu_idx, uint32_t intid,
- struct vcpu *current, struct vcpu **next);
-int64_t api_interrupt_inject_locked(struct vcpu_locked target_locked,
- uint32_t intid,
- struct vcpu_locked current_locked,
- struct vcpu **next);
int64_t api_hf_interrupt_send_ipi(uint32_t target_vcpu_id,
struct vcpu *current);
diff --git a/inc/hf/ffa/interrupts.h b/inc/hf/ffa/interrupts.h
index a786114..9a0f70c 100644
--- a/inc/hf/ffa/interrupts.h
+++ b/inc/hf/ffa/interrupts.h
@@ -19,8 +19,7 @@
void ffa_interrupts_handle_secure_interrupt(struct vcpu *current,
struct vcpu **next);
bool ffa_interrupts_inject_notification_pending_interrupt(
- struct vcpu_locked next_locked, struct vcpu_locked current_locked,
- struct vm_locked receiver_locked);
+ struct vcpu_locked next_locked, struct vm_locked receiver_locked);
bool ffa_interrupts_intercept_call(struct vcpu_locked current_locked,
struct vcpu_locked next_locked,