Replace open coded parsing of CPU nodes' 'reg' property with
of_get_cpu_hwid().

Cc: Paul Walmsley <paul.walms...@sifive.com>
Cc: Palmer Dabbelt <pal...@dabbelt.com>
Cc: Albert Ou <a...@eecs.berkeley.edu>
Cc: linux-ri...@lists.infradead.org
Signed-off-by: Rob Herring <r...@kernel.org>
---
 arch/riscv/kernel/cpu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/riscv/kernel/cpu.c b/arch/riscv/kernel/cpu.c
index 6d59e6906fdd..f13b2c9ea912 100644
--- a/arch/riscv/kernel/cpu.c
+++ b/arch/riscv/kernel/cpu.c
@@ -22,7 +22,8 @@ int riscv_of_processor_hartid(struct device_node *node)
                return -ENODEV;
        }
 
-       if (of_property_read_u32(node, "reg", &hart)) {
+       hart = of_get_cpu_hwid(node, 0);
+       if (hart == ~0U) {
                pr_warn("Found CPU without hart ID\n");
                return -ENODEV;
        }
-- 
2.30.2

Reply via email to