diff options
| author | Tom Rini <trini@konsulko.com> | 2021-05-18 14:17:54 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-05-18 14:17:54 -0400 |
| commit | 428bec7cf956c3558bbdfda4d2ba23beb73a68ba (patch) | |
| tree | 290ddd25fb619aaf112e89e32a4cca181e922e3e /drivers/firmware/psci.c | |
| parent | 7a1638c263508f7ff67fc82af5ea8072dcb783e2 (diff) | |
| parent | af02975eb9e2b1a963b0fb03869ccf1bbf30caa7 (diff) | |
Merge branch '2021-05-17-assorted-fixes'
Diffstat (limited to 'drivers/firmware/psci.c')
| -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 be57552aba0..6755e74e3f8 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; |