Fix errors/warnings caused by vmapi headers in linux driver build.
Change-Id: Ie6207422bc9cdfa95bccb0dd38e3339142bc2cfa
diff --git a/driver/linux b/driver/linux
index 13c3a0b..7fe6233 160000
--- a/driver/linux
+++ b/driver/linux
@@ -1 +1 @@
-Subproject commit 13c3a0bb97ee43cc8040ff2937366ba3d3d4034d
+Subproject commit 7fe6233a5126ef725f065511480a17c8f93cf16d
diff --git a/inc/vmapi/hf/abi.h b/inc/vmapi/hf/abi.h
index 9866059..7382547 100644
--- a/inc/vmapi/hf/abi.h
+++ b/inc/vmapi/hf/abi.h
@@ -75,9 +75,9 @@
*/
static inline struct hf_vcpu_run_return hf_vcpu_run_return_decode(uint64_t res)
{
- struct hf_vcpu_run_return ret;
-
- ret.code = (enum hf_vcpu_run_code)(res & 0xff);
+ struct hf_vcpu_run_return ret = {
+ .code = (enum hf_vcpu_run_code)(res & 0xff),
+ };
/* Some codes include more data. */
switch (ret.code) {
diff --git a/inc/vmapi/hf/call.h b/inc/vmapi/hf/call.h
index 7b523e2..37428f3 100644
--- a/inc/vmapi/hf/call.h
+++ b/inc/vmapi/hf/call.h
@@ -16,8 +16,6 @@
#pragma once
-#include "hf/arch/cpu.h"
-
#include "hf/abi.h"
#include "hf/types.h"
@@ -141,7 +139,7 @@
*
* Returns HF_INVALID_INTID if there are no pending interrupts.
*/
-static inline uint32_t hf_get_and_acknowledge_interrupt()
+static inline uint32_t hf_get_and_acknowledge_interrupt(void)
{
return hf_call(HF_GET_AND_ACKNOWLEDGE_INTERRUPT, 0, 0, 0);
}
