blob: f037d2b58f582d2e2318985c4f528ff01764145f [file] [log] [blame]
Patrick Williams8dd68482022-10-04 07:57:18 -05001From d96f696244e0869654004f49586b53811037db30 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 22 Sep 2022 19:13:49 -0700
4Subject: [PATCH] Fix build with clang-15
5
6Clang-15 warns about prototypes a bit harder
7Remove unused variable suites_in_image
8
9Upstream-Status: Pending
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11
12---
13 test/hftest/common.c | 2 --
14 test/vmapi/arch/aarch64/gicv3/gicv3.c | 2 +-
15 test/vmapi/arch/aarch64/gicv3/inc/gicv3.h | 2 +-
16 test/vmapi/arch/aarch64/gicv3/timer_secondary.c | 2 +-
17 test/vmapi/el0_partitions/services/interruptible.c | 2 +-
18 test/vmapi/el0_partitions/services/interruptible_echo.c | 2 +-
19 test/vmapi/primary_with_secondaries/services/interruptible.c | 2 +-
20 7 files changed, 6 insertions(+), 8 deletions(-)
21
22diff --git a/test/hftest/common.c b/test/hftest/common.c
23index 344ff24..175230a 100644
24--- a/test/hftest/common.c
25+++ b/test/hftest/common.c
26@@ -67,7 +67,6 @@ void hftest_json(void)
27 {
28 const char *suite = NULL;
29 size_t i;
30- size_t suites_in_image = 0;
31 size_t tests_in_suite = 0;
32
33 HFTEST_LOG("{");
34@@ -81,7 +80,6 @@ void hftest_json(void)
35 HFTEST_LOG(" },");
36 }
37 /* Move onto new suite. */
38- ++suites_in_image;
39 suite = test->suite;
40 tests_in_suite = 0;
41 HFTEST_LOG(" {");
42diff --git a/test/vmapi/arch/aarch64/gicv3/gicv3.c b/test/vmapi/arch/aarch64/gicv3/gicv3.c
43index 682bc4e..82582f0 100644
44--- a/test/vmapi/arch/aarch64/gicv3/gicv3.c
45+++ b/test/vmapi/arch/aarch64/gicv3/gicv3.c
46@@ -42,7 +42,7 @@ static void irq(void)
47 dlog("primary IRQ %d ended\n", interrupt_id);
48 }
49
50-void system_setup()
51+void system_setup(void)
52 {
53 const uint32_t mode = MM_MODE_R | MM_MODE_W | MM_MODE_D;
54 hftest_mm_identity_map((void *)GICD_BASE, PAGE_SIZE, mode);
55diff --git a/test/vmapi/arch/aarch64/gicv3/inc/gicv3.h b/test/vmapi/arch/aarch64/gicv3/inc/gicv3.h
56index 5faf3a8..f681e58 100644
57--- a/test/vmapi/arch/aarch64/gicv3/inc/gicv3.h
58+++ b/test/vmapi/arch/aarch64/gicv3/inc/gicv3.h
59@@ -30,4 +30,4 @@ extern void *recv_buffer;
60
61 extern volatile uint32_t last_interrupt_id;
62
63-void system_setup();
64+void system_setup(void);
65diff --git a/test/vmapi/arch/aarch64/gicv3/timer_secondary.c b/test/vmapi/arch/aarch64/gicv3/timer_secondary.c
66index ebc4db3..8260e10 100644
67--- a/test/vmapi/arch/aarch64/gicv3/timer_secondary.c
68+++ b/test/vmapi/arch/aarch64/gicv3/timer_secondary.c
69@@ -55,7 +55,7 @@ TEAR_DOWN(timer_secondary_ffa)
70 EXPECT_FFA_ERROR(ffa_rx_release(), FFA_DENIED);
71 }
72
73-static void timer_busywait_secondary()
74+static void timer_busywait_secondary(void)
75 {
76 const char message[] = "loop 0099999";
77 const char expected_response[] = "Got IRQ 03.";
78diff --git a/test/vmapi/el0_partitions/services/interruptible.c b/test/vmapi/el0_partitions/services/interruptible.c
79index 0d00b16..3c3250d 100644
80--- a/test/vmapi/el0_partitions/services/interruptible.c
81+++ b/test/vmapi/el0_partitions/services/interruptible.c
82@@ -43,7 +43,7 @@ static void irq(void)
83 * Try to receive a message from the mailbox, blocking if necessary, and
84 * retrying if interrupted.
85 */
86-static struct ffa_value mailbox_receive_retry()
87+static struct ffa_value mailbox_receive_retry(void)
88 {
89 struct ffa_value received;
90
91diff --git a/test/vmapi/el0_partitions/services/interruptible_echo.c b/test/vmapi/el0_partitions/services/interruptible_echo.c
92index b618cf2..636ebc9 100644
93--- a/test/vmapi/el0_partitions/services/interruptible_echo.c
94+++ b/test/vmapi/el0_partitions/services/interruptible_echo.c
95@@ -32,7 +32,7 @@ static void irq(void)
96 * Try to receive a message from the mailbox, blocking if necessary, and
97 * retrying if interrupted.
98 */
99-static struct ffa_value mailbox_receive_retry()
100+static struct ffa_value mailbox_receive_retry(void)
101 {
102 struct ffa_value received;
103
104diff --git a/test/vmapi/primary_with_secondaries/services/interruptible.c b/test/vmapi/primary_with_secondaries/services/interruptible.c
105index cc1c1f9..c94093b 100644
106--- a/test/vmapi/primary_with_secondaries/services/interruptible.c
107+++ b/test/vmapi/primary_with_secondaries/services/interruptible.c
108@@ -40,7 +40,7 @@ static void irq(void)
109 * Try to receive a message from the mailbox, blocking if necessary, and
110 * retrying if interrupted.
111 */
112-struct ffa_value mailbox_receive_retry()
113+struct ffa_value mailbox_receive_retry(void)
114 {
115 struct ffa_value received;
116