Unverified Commit fb8179ce authored by Rob Herring's avatar Rob Herring Committed by Palmer Dabbelt
Browse files

riscv: cacheinfo: Use of_property_present() for non-boolean properties 



The use of of_property_read_bool() for non-boolean properties is
deprecated in favor of of_property_present() when testing for property
presence.

Signed-off-by: default avatarRob Herring (Arm) <robh@kernel.org>
Reviewed-by: default avatarClément Léger <cleger@rivosinc.com>
Cc: stable@vger.kernel.org
Fixes: 76d2a049 ("RISC-V: Init and Halt Code")
Link: https://lore.kernel.org/r/20241104190314.270095-1-robh@kernel.org


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

arch/riscv/kernel/cacheinfo.c

+6 −6
Original line number Diff line number Diff line
@@ -108,11 +108,11 @@ int populate_cache_leaves(unsigned int cpu) 
	if (!np)

		return -ENOENT;



	if (of_property_read_bool(np, "cache-size"))

	if (of_property_present(np, "cache-size"))

		ci_leaf_init(this_leaf++, CACHE_TYPE_UNIFIED, level);

	if (of_property_read_bool(np, "i-cache-size"))

	if (of_property_present(np, "i-cache-size"))

		ci_leaf_init(this_leaf++, CACHE_TYPE_INST, level);

	if (of_property_read_bool(np, "d-cache-size"))

	if (of_property_present(np, "d-cache-size"))

		ci_leaf_init(this_leaf++, CACHE_TYPE_DATA, level);



	prev = np;
@@ -125,11 +125,11 @@ int populate_cache_leaves(unsigned int cpu) 
			break;

		if (level <= levels)

			break;

		if (of_property_read_bool(np, "cache-size"))

		if (of_property_present(np, "cache-size"))

			ci_leaf_init(this_leaf++, CACHE_TYPE_UNIFIED, level);

		if (of_property_read_bool(np, "i-cache-size"))

		if (of_property_present(np, "i-cache-size"))

			ci_leaf_init(this_leaf++, CACHE_TYPE_INST, level);

		if (of_property_read_bool(np, "d-cache-size"))

		if (of_property_present(np, "d-cache-size"))

			ci_leaf_init(this_leaf++, CACHE_TYPE_DATA, level);

		levels = level;

	}