2023-03-27 18:35:54

by Rob Herring (Arm)

Subject: [PATCH] openrisc: Use common of_get_cpu_node() instead of open-coding

The common of_get_cpu_node() is equivalent to setup_find_cpu_node(), so
use it instead.

Signed-off-by: Rob Herring <[email protected]>
---
arch/openrisc/kernel/setup.c | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/arch/openrisc/kernel/setup.c b/arch/openrisc/kernel/setup.c
index 0cd04d936a7a..9cf7fb60441f 100644
--- a/arch/openrisc/kernel/setup.c
+++ b/arch/openrisc/kernel/setup.c
@@ -152,21 +152,6 @@ static void print_cpuinfo(void)
printk(KERN_INFO "-- custom unit(s)\n");
}

-static struct device_node *setup_find_cpu_node(int cpu)
-{
- u32 hwid;
- struct device_node *cpun;
-
- for_each_of_cpu_node(cpun) {
- if (of_property_read_u32(cpun, "reg", &hwid))
- continue;
- if (hwid == cpu)
- return cpun;
- }
-
- return NULL;
-}
-
void __init setup_cpuinfo(void)
{
struct device_node *cpu;
@@ -175,7 +160,7 @@ void __init setup_cpuinfo(void)
int cpu_id = smp_processor_id();
struct cpuinfo_or1k *cpuinfo = &cpuinfo_or1k[cpu_id];

- cpu = setup_find_cpu_node(cpu_id);
+ cpu = of_get_cpu_node(cpu_id, NULL);
if (!cpu)
panic("Couldn't find CPU%d in device tree...\n", cpu_id);

@@ -255,7 +240,7 @@ static inline unsigned long extract_value(unsigned long reg, unsigned long mask)
void calibrate_delay(void)
{
const int *val;
- struct device_node *cpu = setup_find_cpu_node(smp_processor_id());
+ struct device_node *cpu = of_get_cpu_node(smp_processor_id(), NULL);

val = of_get_property(cpu, "clock-frequency", NULL);
if (!val)
--
2.39.2

2023-03-31 17:45:07

by Stafford Horne

Subject: Re: [PATCH] openrisc: Use common of_get_cpu_node() instead of open-coding

On Mon, Mar 27, 2023 at 01:28:16PM -0500, Rob Herring wrote:
> The common of_get_cpu_node() is equivalent to setup_find_cpu_node(), so
> use it instead.
>
> Signed-off-by: Rob Herring <[email protected]>

Thanks,

I will queue this.

-Stafford