diff options
| author | Mark Dykes <mardyk01@review.trustedfirmware.org> | 2020-10-14 18:59:27 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-10-14 18:59:27 +0000 |
| commit | dfe577a817d8384c313f0a184be75efeb3cd8445 (patch) | |
| tree | 70b809f525b66182abb50f8fa77a9a5202bf0a5f /lib | |
| parent | 5dfe680fa8041d2a4a983fee9517a6bf451a1767 (diff) | |
| parent | 831b0e9824e6c7cb07308830c12977acb79156c7 (diff) | |
| download | platform_external_arm-trusted-firmware-dfe577a817d8384c313f0a184be75efeb3cd8445.tar.gz platform_external_arm-trusted-firmware-dfe577a817d8384c313f0a184be75efeb3cd8445.tar.bz2 platform_external_arm-trusted-firmware-dfe577a817d8384c313f0a184be75efeb3cd8445.zip | |
Merge "Don't return error information from console_flush" into integration
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc/assert.c | 8 | ||||
| -rw-r--r-- | lib/psci/psci_system_off.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lib/libc/assert.c b/lib/libc/assert.c index 49f59db16..ff987b3be 100644 --- a/lib/libc/assert.c +++ b/lib/libc/assert.c @@ -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 */ @@ -23,7 +23,7 @@ void __dead2 __assert(const char *file, unsigned int line, { printf("ASSERT: %s:%d:%s\n", file, line, assertion); backtrace("assert"); - (void)console_flush(); + console_flush(); plat_panic_handler(); } #elif PLAT_LOG_LEVEL_ASSERT >= LOG_LEVEL_INFO @@ -31,14 +31,14 @@ void __dead2 __assert(const char *file, unsigned int line) { printf("ASSERT: %s:%d\n", file, line); backtrace("assert"); - (void)console_flush(); + console_flush(); plat_panic_handler(); } #else void __dead2 __assert(void) { backtrace("assert"); - (void)console_flush(); + console_flush(); plat_panic_handler(); } #endif diff --git a/lib/psci/psci_system_off.c b/lib/psci/psci_system_off.c index 141d69ef2..002392cad 100644 --- a/lib/psci/psci_system_off.c +++ b/lib/psci/psci_system_off.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2014-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -25,7 +25,7 @@ void __dead2 psci_system_off(void) psci_spd_pm->svc_system_off(); } - (void) console_flush(); + console_flush(); /* Call the platform specific hook */ psci_plat_pm_ops->system_off(); @@ -44,7 +44,7 @@ void __dead2 psci_system_reset(void) psci_spd_pm->svc_system_reset(); } - (void) console_flush(); + console_flush(); /* Call the platform specific hook */ psci_plat_pm_ops->system_reset(); @@ -77,7 +77,7 @@ u_register_t psci_system_reset2(uint32_t reset_type, u_register_t cookie) if ((psci_spd_pm != NULL) && (psci_spd_pm->svc_system_reset != NULL)) { psci_spd_pm->svc_system_reset(); } - (void) console_flush(); + console_flush(); return (u_register_t) psci_plat_pm_ops->system_reset2((int) is_vendor, reset_type, |