diff options
| author | Igor Opaniuk <igor.opaniuk@foundries.io> | 2021-05-06 17:34:27 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-05-17 17:18:40 -0400 |
| commit | eefa9d7f089f5da5646b40bd713e8c42b27c2e43 (patch) | |
| tree | f60b1ce2cfb582db3816f5eacc557d6854d7f749 /drivers/firmware | |
| parent | 6c353b34cfd86797be25de8908695132646ef321 (diff) | |
| download | u-boot-eefa9d7f089f5da5646b40bd713e8c42b27c2e43.zip u-boot-eefa9d7f089f5da5646b40bd713e8c42b27c2e43.tar.gz u-boot-eefa9d7f089f5da5646b40bd713e8c42b27c2e43.tar.bz2 | |
psci: rename psci_features function
s/psci_features/request_psci_features/g for the case when both
ARCH_SUPPORT_PSCI=y and ARM_PSCI_FW=y, that leads to these
compilation issues:
drivers/firmware/psci.c:69:12: error: conflicting types for 'psci_features'
69 | static int psci_features(u32 psci_func_id)
| ^~~~~~~~~~~~~
In file included from drivers/firmware/psci.c:23:
./arch/arm/include/asm/system.h:548:5: note: previous declaration of 'psci_features' was here
548 | s32 psci_features(u32 function_id, u32 psci_fid);
| ^~~~~~~~~~~~~
Tested-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Reported-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Fixes: b7135b034f ("psci: add features/reset2 support")
Signed-off-by: Igor Opaniuk <igor.opaniuk@foundries.io>
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/psci.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index be57552..6755e74 100644 --- a/drivers/firmware/psci.c +++ b/drivers/firmware/psci.c @@ -66,7 +66,7 @@ unsigned long __efi_runtime invoke_psci_fn return res.a0; } -static int psci_features(u32 psci_func_id) +static int request_psci_features(u32 psci_func_id) { return invoke_psci_fn(PSCI_1_0_FN_PSCI_FEATURES, psci_func_id, 0, 0); @@ -85,7 +85,8 @@ static bool psci_is_system_reset2_supported(void) ver = psci_0_2_get_version(); if (PSCI_VERSION_MAJOR(ver) >= 1) { - ret = psci_features(PSCI_FN_NATIVE(1_1, SYSTEM_RESET2)); + ret = request_psci_features(PSCI_FN_NATIVE(1_1, + SYSTEM_RESET2)); if (ret != PSCI_RET_NOT_SUPPORTED) return true; |