Refactor get_cpu_for_node to use of_cpu_phandle_to_id instead of of_cpu_node_to_id.
Reviewed-by: Jonathan Cameron jonathan.cameron@huawei.com Signed-off-by: Alireza Sanaee alireza.sanaee@huawei.com --- drivers/base/arch_topology.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c index 6fafd86f608a..72bf23cdf469 100644 --- a/drivers/base/arch_topology.c +++ b/drivers/base/arch_topology.c @@ -474,20 +474,19 @@ static unsigned int max_smt_thread_num = 1; static int __init get_cpu_for_node(struct device_node *node) { int cpu; - struct device_node *cpu_node __free(device_node) = - of_parse_phandle(node, "cpu", 0); + struct device_node *cpu_node = NULL;
- if (!cpu_node) - return -1; - - cpu = of_cpu_node_to_id(cpu_node); - if (cpu < 0) { + cpu = of_cpu_phandle_to_id(node, &cpu_node, 0); + if (cpu == -ENODEV) { pr_info("CPU node exist but the possible cpu range is :%*pbl\n", cpumask_pr_args(cpu_possible_mask)); return cpu; + } else if (cpu < 0) { + return -1; }
topology_parse_cpu_capacity(cpu_node, cpu); + of_node_put(cpu_node); return cpu; }