[PATCH v2] psci: rename psci_features function

[PATCH v2] psci: rename psci_features function

[Igor Opaniuk]

From: Igor Opaniuk <igor.opaniuk@foundries.io>

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>

---

Changes in v2:
- Renamed function name (request_psci_features instead of
  psci_features_req)
- Added T-b and Fixes tags

 drivers/firmware/psci.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
index be57552aba..6755e74e3f 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;
-- 
2.25.1

[PATCH v2] psci: rename psci_features function

[Tom Rini]

On Thu, May 06, 2021 at 05:34:27PM +0300, Igor Opaniuk wrote:

> From: Igor Opaniuk <igor.opaniuk@foundries.io>
> 
> 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>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210518/92a4c69e/attachment.sig>