Unverified Commit ee3fab10 authored by Yunhui Cui's avatar Yunhui Cui Committed by Palmer Dabbelt
Browse files

riscv: cacheinfo: remove the useless input parameter (node) of ci_leaf_init() 



ci_leaf_init() is a declared static function. The implementation of the
function body and the caller do not use the parameter (struct device_node
*node) input parameter, so remove it.

Fixes: 6a249151 ("Revert "riscv: Set more data to cacheinfo"")
Signed-off-by: default avatarYunhui Cui <cuiyunhui@bytedance.com>
Reviewed-by: default avatarJeremy Linton <jeremy.linton@arm.com>
Reviewed-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Link: https://lore.kernel.org/r/20240617131425.7526-1-cuiyunhui@bytedance.com


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent 1613e604

arch/riscv/kernel/cacheinfo.c

+6 −7
Original line number Diff line number Diff line
@@ -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);