powerpc: powermac: Use of_get_cpu_hwid() to read CPU node 'reg'

Replace open coded reading of CPU nodes' "reg" properties with
of_get_cpu_hwid() dedicated for this purpose.

Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230319145931.65499-1-robh@kernel.org

diff --git a/arch/powerpc/platforms/powermac/feature.c b/arch/powerpc/platforms/powermac/feature.c
index a195d5f..ed58928 100644 (file)
--- a/arch/powerpc/platforms/powermac/feature.c
+++ b/arch/powerpc/platforms/powermac/feature.c
@@ -1053,11 +1053,11 @@ core99_reset_cpu(struct device_node *node, long param, long value)
                return -ENODEV;
 
        for_each_of_cpu_node(np) {
-               const u32 *num = of_get_property(np, "reg", NULL);
                const u32 *rst = of_get_property(np, "soft-reset", NULL);
-               if (num == NULL || rst == NULL)
+               if (!rst)
                        continue;
-               if (param == *num) {
+               if (param == of_get_cpu_hwid(np, 0)) {
+                       of_node_put(np);
                        reset_io = *rst;
                        break;
                }
@@ -1499,11 +1499,11 @@ static long g5_reset_cpu(struct device_node *node, long param, long value)
                return -ENODEV;
 
        for_each_of_cpu_node(np) {
-               const u32 *num = of_get_property(np, "reg", NULL);
                const u32 *rst = of_get_property(np, "soft-reset", NULL);
-               if (num == NULL || rst == NULL)
+               if (!rst)
                        continue;
-               if (param == *num) {
+               if (param == of_get_cpu_hwid(np, 0)) {
+                       of_node_put(np);
                        reset_io = *rst;
                        break;
                }