blob: f60391447d635861c874af942e01f614d7083e7b [file] [log] [blame]
Andrew Geissler9347dd42023-03-03 12:38:41 -06001From df6006190f112a4ecc54ed0a35d3ea83a2350c73 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 2 Feb 2023 17:37:52 -0800
4Subject: [PATCH] Fix function protype mismatches
5
6These are flagged by gcc13
7avs_gic.c:241:1: error: conflicting types for 'val_gic_get_info' due to enum/integer mismatch; have 'uint32_t(uint32_t)' {aka 'unsigned int(unsigned int)'} [-Werror=enum-int-mismatch]
8| 241 | val_gic_get_info(uint32_t type)
9| | ^~~~~~~~~~~~~~~~
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12Upstream-Status: Backport
13---
14 val/include/val_interface.h | 2 +-
15 val/src/avs_gic.c | 2 +-
16 2 files changed, 2 insertions(+), 2 deletions(-)
17
18diff --git a/val/include/val_interface.h b/val/include/val_interface.h
19index 053fdfa..8814b41 100644
20--- a/val/include/val_interface.h
21+++ b/val/include/val_interface.h
22@@ -181,7 +181,7 @@ typedef enum {
23 void val_wd_create_info_table(uint64_t *wd_info_table);
24 void val_wd_free_info_table(void);
25 uint32_t val_wd_execute_tests(uint32_t level, uint32_t num_pe);
26-uint64_t val_wd_get_info(uint32_t index, uint32_t info_type);
27+uint64_t val_wd_get_info(uint32_t index, WD_INFO_TYPE_e info_type);
28 uint32_t val_wd_set_ws0(uint32_t index, uint32_t timeout);
29 uint64_t val_get_counter_frequency(void);
30
31diff --git a/val/src/avs_gic.c b/val/src/avs_gic.c
32index b37f106..1146a01 100644
33--- a/val/src/avs_gic.c
34+++ b/val/src/avs_gic.c
35@@ -249,7 +249,7 @@ val_get_cpuif_base(void)
36 @return 32-bit data
37 **/
38 uint32_t
39-val_gic_get_info(uint32_t type)
40+val_gic_get_info(GIC_INFO_e type)
41 {
42 uint32_t rdbase_len;
43