diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_clock.c b/plat/xilinx/zynqmp/pm_service/pm_api_clock.c index f2dfbb17b68d69a97f2bb29e01ddfaa44bef5369..0cc517ec9e8bf56dc689ba1f7ead301403797c4f 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_api_clock.c +++ b/plat/xilinx/zynqmp/pm_service/pm_api_clock.c @@ -2446,7 +2446,7 @@ enum pm_ret_status pm_api_clock_get_num_clocks(unsigned int *nclocks) * * @return Returns success. In case of error, name data is 0. */ -enum pm_ret_status pm_api_clock_get_name(unsigned int clock_id, char *name) +void pm_api_clock_get_name(unsigned int clock_id, char *name) { if (clock_id == CLK_MAX) memcpy(name, END_OF_CLK, sizeof(END_OF_CLK) > CLK_NAME_LEN ? @@ -2458,8 +2458,6 @@ enum pm_ret_status pm_api_clock_get_name(unsigned int clock_id, char *name) else memcpy(name, ext_clocks[clock_id - CLK_MAX_OUTPUT_CLK].name, CLK_NAME_LEN); - - return PM_RET_SUCCESS; } /** diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_clock.h b/plat/xilinx/zynqmp/pm_service/pm_api_clock.h index 301ed24b65b4099b842429c69d33b28ec1c3727a..5efd63ff579467ba9188536fdc320fb7aab2b9f0 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_api_clock.h +++ b/plat/xilinx/zynqmp/pm_service/pm_api_clock.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2018-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -294,7 +294,7 @@ struct pm_pll *pm_clock_get_pll(enum clock_id clock_id); struct pm_pll *pm_clock_get_pll_by_related_clk(enum clock_id clock_id); uint8_t pm_clock_has_div(unsigned int clock_id, enum pm_clock_div_id div_id); -enum pm_ret_status pm_api_clock_get_name(unsigned int clock_id, char *name); +void pm_api_clock_get_name(unsigned int clock_id, char *name); enum pm_ret_status pm_api_clock_get_num_clocks(unsigned int *nclocks); enum pm_ret_status pm_api_clock_get_topology(unsigned int clock_id, unsigned int index, diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_pinctrl.c b/plat/xilinx/zynqmp/pm_service/pm_api_pinctrl.c index 4b8dfb6144c100567a7266c2459d3f86c67759c5..05bbe722dada6c8fa7f630f15d4d25e5f6fca858 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_api_pinctrl.c +++ b/plat/xilinx/zynqmp/pm_service/pm_api_pinctrl.c @@ -2604,18 +2604,13 @@ enum pm_ret_status pm_api_pinctrl_get_num_func_groups(unsigned int fid, * * This function is used by master to get name of function specified * by given function ID. - * - * @return Returns success. In case of error, name data is 0. */ -enum pm_ret_status pm_api_pinctrl_get_function_name(unsigned int fid, - char *name) +void pm_api_pinctrl_get_function_name(unsigned int fid, char *name) { if (fid >= MAX_FUNCTION) memcpy(name, END_OF_FUNCTION, FUNCTION_NAME_LEN); else memcpy(name, pinctrl_functions[fid].name, FUNCTION_NAME_LEN); - - return PM_RET_SUCCESS; } /** diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_pinctrl.h b/plat/xilinx/zynqmp/pm_service/pm_api_pinctrl.h index 9923c00ba9257ae1e45f01733c227ab19aa477ff..414a27334c1a9255497c09206b0a5b402730b3c8 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_api_pinctrl.h +++ b/plat/xilinx/zynqmp/pm_service/pm_api_pinctrl.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2018-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -719,8 +719,7 @@ enum pm_ret_status pm_api_pinctrl_set_config(unsigned int pin, enum pm_ret_status pm_api_pinctrl_get_config(unsigned int pin, unsigned int param, unsigned int *value); -enum pm_ret_status pm_api_pinctrl_get_function_name(unsigned int fid, - char *name); +void pm_api_pinctrl_get_function_name(unsigned int fid, char *name); enum pm_ret_status pm_api_pinctrl_get_function_groups(unsigned int fid, unsigned int index, uint16_t *groups); diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_sys.c b/plat/xilinx/zynqmp/pm_service/pm_api_sys.c index cd9d597bfceb715c7e7bee7b702a19acd99862cc..c37a3b3d3b8e3c5edc5ec5485c4edf08d4b2ac98 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_api_sys.c +++ b/plat/xilinx/zynqmp/pm_service/pm_api_sys.c @@ -793,12 +793,10 @@ static enum pm_ret_status pm_clock_get_num_clocks(uint32_t *nclocks) * * This function is used by master to get nmae of clock specified * by given clock ID. - * - * @return Returns status, either success or error+reason */ -static enum pm_ret_status pm_clock_get_name(unsigned int clock_id, char *name) +static void pm_clock_get_name(unsigned int clock_id, char *name) { - return pm_api_clock_get_name(clock_id, name); + pm_api_clock_get_name(clock_id, name); } /** @@ -1235,13 +1233,10 @@ static enum pm_ret_status pm_pinctrl_get_num_function_groups(unsigned int fid, * * This function is used by master to get name of function specified * by given function Id - * - * Return: Returns status, either success or error+reason. */ -static enum pm_ret_status pm_pinctrl_get_function_name(unsigned int fid, - char *name) +static void pm_pinctrl_get_function_name(unsigned int fid, char *name) { - return pm_api_pinctrl_get_function_name(fid, name); + pm_api_pinctrl_get_function_name(fid, name); } /** @@ -1301,78 +1296,58 @@ static enum pm_ret_status pm_pinctrl_get_pin_groups(unsigned int pin_id, * @data Returned output data * * This function returns requested data. - * - * @return Returns status, either success or error+reason */ -enum pm_ret_status pm_query_data(enum pm_query_id qid, - unsigned int arg1, - unsigned int arg2, - unsigned int arg3, - unsigned int *data) +void pm_query_data(enum pm_query_id qid, unsigned int arg1, unsigned int arg2, + unsigned int arg3, unsigned int *data) { - enum pm_ret_status ret; - switch (qid) { case PM_QID_CLOCK_GET_NAME: - ret = pm_clock_get_name(arg1, (char *)data); + pm_clock_get_name(arg1, (char *)data); break; case PM_QID_CLOCK_GET_TOPOLOGY: - ret = pm_clock_get_topology(arg1, arg2, &data[1]); - data[0] = (unsigned int)ret; + data[0] = pm_clock_get_topology(arg1, arg2, &data[1]); break; case PM_QID_CLOCK_GET_FIXEDFACTOR_PARAMS: - ret = pm_clock_get_fixedfactor_params(arg1, &data[1], &data[2]); - data[0] = (unsigned int)ret; + data[0] = pm_clock_get_fixedfactor_params(arg1, &data[1], + &data[2]); break; case PM_QID_CLOCK_GET_PARENTS: - ret = pm_clock_get_parents(arg1, arg2, &data[1]); - data[0] = (unsigned int)ret; + data[0] = pm_clock_get_parents(arg1, arg2, &data[1]); break; case PM_QID_CLOCK_GET_ATTRIBUTES: - ret = pm_clock_get_attributes(arg1, &data[1]); - data[0] = (unsigned int)ret; + data[0] = pm_clock_get_attributes(arg1, &data[1]); break; case PM_QID_PINCTRL_GET_NUM_PINS: - ret = pm_pinctrl_get_num_pins(&data[1]); - data[0] = (unsigned int)ret; + data[0] = pm_pinctrl_get_num_pins(&data[1]); break; case PM_QID_PINCTRL_GET_NUM_FUNCTIONS: - ret = pm_pinctrl_get_num_functions(&data[1]); - data[0] = (unsigned int)ret; + data[0] = pm_pinctrl_get_num_functions(&data[1]); break; case PM_QID_PINCTRL_GET_NUM_FUNCTION_GROUPS: - ret = pm_pinctrl_get_num_function_groups(arg1, &data[1]); - data[0] = (unsigned int)ret; + data[0] = pm_pinctrl_get_num_function_groups(arg1, &data[1]); break; case PM_QID_PINCTRL_GET_FUNCTION_NAME: - ret = pm_pinctrl_get_function_name(arg1, (char *)data); + pm_pinctrl_get_function_name(arg1, (char *)data); break; case PM_QID_PINCTRL_GET_FUNCTION_GROUPS: - ret = pm_pinctrl_get_function_groups(arg1, arg2, - (uint16_t *)&data[1]); - data[0] = (unsigned int)ret; + data[0] = pm_pinctrl_get_function_groups(arg1, arg2, + (uint16_t *)&data[1]); break; case PM_QID_PINCTRL_GET_PIN_GROUPS: - ret = pm_pinctrl_get_pin_groups(arg1, arg2, - (uint16_t *)&data[1]); - data[0] = (unsigned int)ret; + data[0] = pm_pinctrl_get_pin_groups(arg1, arg2, + (uint16_t *)&data[1]); break; case PM_QID_CLOCK_GET_NUM_CLOCKS: - ret = pm_clock_get_num_clocks(&data[1]); - data[0] = (unsigned int)ret; + data[0] = pm_clock_get_num_clocks(&data[1]); break; case PM_QID_CLOCK_GET_MAX_DIVISOR: - ret = pm_clock_get_max_divisor(arg1, arg2, &data[1]); - data[0] = (unsigned int)ret; + data[0] = pm_clock_get_max_divisor(arg1, arg2, &data[1]); break; default: - ret = PM_RET_ERROR_ARGS; + data[0] = PM_RET_ERROR_ARGS; WARN("Unimplemented query service call: 0x%x\n", qid); - break; } - - return ret; } enum pm_ret_status pm_sha_hash(uint32_t address_high, diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_sys.h b/plat/xilinx/zynqmp/pm_service/pm_api_sys.h index ff66d3f024a84dc2173fdae8e208c27f64017e51..930e4702f516fbb8e1dc78a0dfccb57c3ea75543 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_api_sys.h +++ b/plat/xilinx/zynqmp/pm_service/pm_api_sys.h @@ -151,11 +151,8 @@ enum pm_ret_status pm_clock_setparent(unsigned int clock_id, unsigned int parent_id); enum pm_ret_status pm_clock_getparent(unsigned int clock_id, unsigned int *parent_id); -enum pm_ret_status pm_query_data(enum pm_query_id qid, - unsigned int arg1, - unsigned int arg2, - unsigned int arg3, - unsigned int *data); +void pm_query_data(enum pm_query_id qid, unsigned int arg1, unsigned int arg2, + unsigned int arg3, unsigned int *data); enum pm_ret_status pm_sha_hash(uint32_t address_high, uint32_t address_low, uint32_t size, diff --git a/plat/xilinx/zynqmp/pm_service/pm_svc_main.c b/plat/xilinx/zynqmp/pm_service/pm_svc_main.c index 3f4f0691e5ebbb81f768f01dc9f4d178e3e6d39e..14321ec7798fccadd469521a49a5ef07e58e07a3 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_svc_main.c +++ b/plat/xilinx/zynqmp/pm_service/pm_svc_main.c @@ -474,8 +474,8 @@ uint64_t pm_smc_handler(uint32_t smc_fid, uint64_t x1, uint64_t x2, uint64_t x3, { uint32_t data[4] = { 0 }; - ret = pm_query_data(pm_arg[0], pm_arg[1], pm_arg[2], - pm_arg[3], data); + pm_query_data(pm_arg[0], pm_arg[1], pm_arg[2], + pm_arg[3], data); SMC_RET2(handle, (uint64_t)data[0] | ((uint64_t)data[1] << 32), (uint64_t)data[2] | ((uint64_t)data[3] << 32)); }