When building with gcc-13.1 we see that the prototype for cvmx_pko3_sq_config_children does not match the declaration. Make these match and correct a typo in the function's version of the docs that the prototype did not have, as part of keeping those in-sync.
Signed-off-by: Tom Rini trini@konsulko.com --- Cc: Aaron Williams awilliams@marvell.com Cc: Stefan Roese sr@denx.de --- arch/mips/mach-octeon/cvmx-pko3-queue.c | 2 +- .../mips/mach-octeon/include/mach/cvmx-pko3-queue.h | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/arch/mips/mach-octeon/cvmx-pko3-queue.c b/arch/mips/mach-octeon/cvmx-pko3-queue.c index e28afdf8dd9d..53f2e4dd1861 100644 --- a/arch/mips/mach-octeon/cvmx-pko3-queue.c +++ b/arch/mips/mach-octeon/cvmx-pko3-queue.c @@ -761,7 +761,7 @@ int cvmx_pko3_pq_config(unsigned int node, unsigned int mac_num, * The Scheduler Queues in Levels 3 to 5 and Descriptor Queues are * configured one-to-one or many-to-one to a single parent Scheduler * Queues. The level of the parent SQ is specified in an argument, - * as well as the number of childer to attach to the specific parent. + * as well as the number of children to attach to the specific parent. * The children can have fair round-robin or priority-based scheduling * when multiple children are assigned a single parent. * diff --git a/arch/mips/mach-octeon/include/mach/cvmx-pko3-queue.h b/arch/mips/mach-octeon/include/mach/cvmx-pko3-queue.h index b3f61d75f225..3931191fe20f 100644 --- a/arch/mips/mach-octeon/include/mach/cvmx-pko3-queue.h +++ b/arch/mips/mach-octeon/include/mach/cvmx-pko3-queue.h @@ -6,6 +6,8 @@ #ifndef __CVMX_PKO3_QUEUE_H__ #define __CVMX_PKO3_QUEUE_H__
+enum cvmx_pko3_level_e; + /** * @INTERNAL * @@ -46,11 +48,10 @@ int cvmx_pko3_get_port_queue(int xiface, int index); * The children can have fair round-robin or priority-based scheduling * when multiple children are assigned a single parent. * - * @param node is the OCI node location for the queues to be configured - * @param parent_level is the level of the parent queue, 2 to 5. + * @param node on which to operate + * @param child_level is the level of the child queue * @param parent_queue is the number of the parent Scheduler Queue * @param child_base is the number of the first child SQ or DQ to assign to - * @param parent * @param child_count is the number of consecutive children to assign * @param stat_prio_count is the priority setting for the children L2 SQs * @@ -65,8 +66,10 @@ int cvmx_pko3_get_port_queue(int xiface, int index); * * Note: this function supports the configuration of node-local unit. */ -int cvmx_pko3_sq_config_children(unsigned int node, unsigned int parent_level, - unsigned int parent_queue, unsigned int child_base, +int cvmx_pko3_sq_config_children(unsigned int node, + enum cvmx_pko3_level_e child_level, + unsigned int parent_queue, + unsigned int child_base, unsigned int child_count, int stat_prio_count);
/*