diff options
author | Jimmy Brisson <jimmy.brisson@arm.com> | 2020-08-05 13:44:05 -0500 |
---|---|---|
committer | laurenw-arm <lauren.wehrmeister@arm.com> | 2020-10-09 10:21:50 -0500 |
commit | 831b0e9824e6c7cb07308830c12977acb79156c7 (patch) | |
tree | b36c5ee1945761c86823380b6763d7f143c30210 /include | |
parent | bb68a9d602e456dad89fbfc777cb435059d42964 (diff) | |
download | trusted-firmware-a-831b0e9824e6c7cb07308830c12977acb79156c7.tar.gz |
Don't return error information from console_flush
And from crash_console_flush.
We ignore the error information return by console_flush in _every_
place where we call it, and casting the return type to void does not
work around the MISRA violation that this causes. Instead, we collect
the error information from the driver (to avoid changing that API), and
don't return it to the caller.
Change-Id: I1e35afe01764d5c8f0efd04f8949d333ffb688c1
Signed-off-by: Jimmy Brisson <jimmy.brisson@arm.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/common/debug.h | 2 | ||||
-rw-r--r-- | include/drivers/console.h | 6 | ||||
-rw-r--r-- | include/plat/common/platform.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/common/debug.h b/include/common/debug.h index 9aef15b514..ed0e8bf97c 100644 --- a/include/common/debug.h +++ b/include/common/debug.h @@ -101,7 +101,7 @@ void __dead2 do_panic(void); #define panic() \ do { \ backtrace(__func__); \ - (void)console_flush(); \ + console_flush(); \ do_panic(); \ } while (false) diff --git a/include/drivers/console.h b/include/drivers/console.h index 761816ac74..99bf960418 100644 --- a/include/drivers/console.h +++ b/include/drivers/console.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2019, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -43,7 +43,7 @@ typedef struct console { u_register_t flags; int (*const putc)(int character, struct console *console); int (*const getc)(struct console *console); - int (*const flush)(struct console *console); + void (*const flush)(struct console *console); uintptr_t base; /* Additional private driver data may follow here. */ } console_t; @@ -76,7 +76,7 @@ int console_putc(int c); /* Read a character (blocking) from any console registered for current state. */ int console_getc(void); /* Flush all consoles registered for the current state. */ -int console_flush(void); +void console_flush(void); #endif /* __ASSEMBLER__ */ diff --git a/include/plat/common/platform.h b/include/plat/common/platform.h index 2c1a180c83..ebcc855774 100644 --- a/include/plat/common/platform.h +++ b/include/plat/common/platform.h @@ -111,7 +111,7 @@ uintptr_t plat_get_my_stack(void); void plat_report_exception(unsigned int exception_type); int plat_crash_console_init(void); int plat_crash_console_putc(int c); -int plat_crash_console_flush(void); +void plat_crash_console_flush(void); void plat_error_handler(int err) __dead2; void plat_panic_handler(void) __dead2; const char *plat_log_get_prefix(unsigned int log_level); |