[PATCH 05/15] firmware: xilinx: Rename zynqmp_pm_invoke_fw_fn()
From: Gregory Williams
Date: Wed Nov 18 2026 - 18:32:46 EST
From: Senthil Nathan Thangaraj <senthilnathan.thangaraj@xxxxxxx>
The function name zynqmp_pm_invoke_fw_fn() doesn't really reflect what this
function does, so rename it to zynqmp_pm_fw_call_extended(), which reflects
which firmware format is used.
Signed-off-by: Michal Simek <michal.simek@xxxxxxx>
Signed-off-by: Senthil Nathan Thangaraj <senthilnathan.thangaraj@xxxxxxx>
---
drivers/firmware/xilinx/zynqmp.c | 10 +++++-----
include/linux/firmware/xlnx-zynqmp.h | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c
index f5ad99e0026c..709370933741 100644
--- a/drivers/firmware/xilinx/zynqmp.c
+++ b/drivers/firmware/xilinx/zynqmp.c
@@ -440,7 +440,7 @@ int zynqmp_pm_is_function_supported(const u32 api_id, const u32 id)
EXPORT_SYMBOL_GPL(zynqmp_pm_is_function_supported);
/**
- * zynqmp_pm_invoke_fw_fn() - Invoke the system-level platform management layer
+ * zynqmp_pm_fw_call_extended() - Invoke the system-level platform management layer
* caller function depending on the configuration
* @pm_api_id: Requested PM-API call
* @ret_payload: Returned value array
@@ -461,7 +461,7 @@ EXPORT_SYMBOL_GPL(zynqmp_pm_is_function_supported);
*
* Return: Returns status, either success or error+reason
*/
-int zynqmp_pm_invoke_fw_fn(u32 pm_api_id, u32 *ret_payload, u32 num_args, ...)
+int zynqmp_pm_fw_call_extended(u32 pm_api_id, u32 *ret_payload, u32 num_args, ...)
{
/*
* Added SIP service call Function Identifier
@@ -796,9 +796,9 @@ int zynqmp_pm_query_data(struct zynqmp_pm_query_data qdata, u32 *out)
u32 ret_payload[PAYLOAD_ARG_CNT] = {0};
if (sip_svc_version >= SIP_SVC_PASSTHROUGH_VERSION) {
- ret = zynqmp_pm_invoke_fw_fn(PM_QUERY_DATA, ret_payload, 4,
- qdata.qid, qdata.arg1,
- qdata.arg2, qdata.arg3);
+ ret = zynqmp_pm_fw_call_extended(PM_QUERY_DATA, ret_payload, 4,
+ qdata.qid, qdata.arg1,
+ qdata.arg2, qdata.arg3);
/* To support backward compatibility */
if (!ret && !ret_payload[0]) {
/*
diff --git a/include/linux/firmware/xlnx-zynqmp.h b/include/linux/firmware/xlnx-zynqmp.h
index 681ab99ceffc..58f2e3fddfaf 100644
--- a/include/linux/firmware/xlnx-zynqmp.h
+++ b/include/linux/firmware/xlnx-zynqmp.h
@@ -578,7 +578,7 @@ struct zynqmp_pm_query_data {
};
int zynqmp_pm_invoke_fn(u32 pm_api_id, u32 *ret_payload, u32 num_args, ...);
-int zynqmp_pm_invoke_fw_fn(u32 pm_api_id, u32 *ret_payload, u32 num_args, ...);
+int zynqmp_pm_fw_call_extended(u32 pm_api_id, u32 *ret_payload, u32 num_args, ...);
#if IS_REACHABLE(CONFIG_ZYNQMP_FIRMWARE)
int zynqmp_pm_get_api_version(u32 *version);
--
2.34.1