[PATCH v3 1/3] riscv: cacheinfo: remove the useless parameter (node) of ci_leaf_init()

[Jeremy Linton]

Hi,

Other than a comment in 2/3 this all (patches 1-3) looks sane to me. So:

Reviewed-by: Jeremy Linton <jeremy.linton at arm.com>

Thanks,


On 4/15/24 22:14, Yunhui Cui wrote:
> The implementation of the ci_leaf_init() function body and the caller
> do not use the input parameter (struct device_node *node), so remove it.
> 
> Fixes: 6a24915145c9 ("Revert "riscv: Set more data to cacheinfo"")
> Signed-off-by: Yunhui Cui <cuiyunhui at bytedance.com>
> ---
>   arch/riscv/kernel/cacheinfo.c | 13 ++++++-------
>   1 file changed, 6 insertions(+), 7 deletions(-)
> 
> diff --git a/arch/riscv/kernel/cacheinfo.c b/arch/riscv/kernel/cacheinfo.c
> index 09e9b88110d1..30a6878287ad 100644
> --- a/arch/riscv/kernel/cacheinfo.c
> +++ b/arch/riscv/kernel/cacheinfo.c
> @@ -64,7 +64,6 @@ uintptr_t get_cache_geometry(u32 level, enum cache_type type)
>   }
>   
>   static void ci_leaf_init(struct cacheinfo *this_leaf,
> -			 struct device_node *node,
>   			 enum cache_type type, unsigned int level)
>   {
>   	this_leaf->level = level;
> @@ -80,11 +79,11 @@ int populate_cache_leaves(unsigned int cpu)
>   	int levels = 1, level = 1;
>   
>   	if (of_property_read_bool(np, "cache-size"))
> -		ci_leaf_init(this_leaf++, np, CACHE_TYPE_UNIFIED, level);
> +		ci_leaf_init(this_leaf++, CACHE_TYPE_UNIFIED, level);
>   	if (of_property_read_bool(np, "i-cache-size"))
> -		ci_leaf_init(this_leaf++, np, CACHE_TYPE_INST, level);
> +		ci_leaf_init(this_leaf++, CACHE_TYPE_INST, level);
>   	if (of_property_read_bool(np, "d-cache-size"))
> -		ci_leaf_init(this_leaf++, np, CACHE_TYPE_DATA, level);
> +		ci_leaf_init(this_leaf++, CACHE_TYPE_DATA, level);
>   
>   	prev = np;
>   	while ((np = of_find_next_cache_node(np))) {
> @@ -97,11 +96,11 @@ int populate_cache_leaves(unsigned int cpu)
>   		if (level <= levels)
>   			break;
>   		if (of_property_read_bool(np, "cache-size"))
> -			ci_leaf_init(this_leaf++, np, CACHE_TYPE_UNIFIED, level);
> +			ci_leaf_init(this_leaf++, CACHE_TYPE_UNIFIED, level);
>   		if (of_property_read_bool(np, "i-cache-size"))
> -			ci_leaf_init(this_leaf++, np, CACHE_TYPE_INST, level);
> +			ci_leaf_init(this_leaf++, CACHE_TYPE_INST, level);
>   		if (of_property_read_bool(np, "d-cache-size"))
> -			ci_leaf_init(this_leaf++, np, CACHE_TYPE_DATA, level);
> +			ci_leaf_init(this_leaf++, CACHE_TYPE_DATA, level);
>   		levels = level;
>   	}
>   	of_node_put(np);