diff options
| author | Rob Herring <robh@kernel.org> | 2023-03-19 09:59:31 -0500 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2023-06-21 14:08:54 +1000 |
| commit | bc1cf75027585f8d87f94e464ee5909acf885a8c (patch) | |
| tree | 44ed5a8db037069a7bfbdb8da258a330cbd88572 | |
| parent | b751ed04bc5e1b76f2885b846ea8289792a37166 (diff) | |
| download | lwn-bc1cf75027585f8d87f94e464ee5909acf885a8c.tar.gz lwn-bc1cf75027585f8d87f94e464ee5909acf885a8c.zip | |
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
| -rw-r--r-- | arch/powerpc/platforms/powermac/feature.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/powermac/feature.c b/arch/powerpc/platforms/powermac/feature.c index a195d5faa4e5..ed58928469b5 100644 --- 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; } |