Commit 82f7c510 authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Linus Torvalds

sh: make use of for_each_node_by_type()

Instead of open-coding the loop, let's use canned macro.

Also make sure we are not leaking "cpus" node reference.

Link: http://lkml.kernel.org/r/20180624224252.GA220395@dtor-wsSigned-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Reviewed-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Rich Felker <dalias@libc.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ab62ef82
...@@ -56,15 +56,15 @@ const struct of_cpu_method __cpu_method_of_table_sentinel ...@@ -56,15 +56,15 @@ const struct of_cpu_method __cpu_method_of_table_sentinel
static void sh_of_smp_probe(void) static void sh_of_smp_probe(void)
{ {
struct device_node *np = 0; struct device_node *np;
const char *method = 0; const char *method = NULL;
const struct of_cpu_method *m = __cpu_method_of_table; const struct of_cpu_method *m = __cpu_method_of_table;
pr_info("SH generic board support: scanning for cpus\n"); pr_info("SH generic board support: scanning for cpus\n");
init_cpu_possible(cpumask_of(0)); init_cpu_possible(cpumask_of(0));
while ((np = of_find_node_by_type(np, "cpu"))) { for_each_node_by_type(np, "cpu") {
const __be32 *cell = of_get_property(np, "reg", NULL); const __be32 *cell = of_get_property(np, "reg", NULL);
u64 id = -1; u64 id = -1;
if (cell) id = of_read_number(cell, of_n_addr_cells(np)); if (cell) id = of_read_number(cell, of_n_addr_cells(np));
...@@ -80,6 +80,7 @@ static void sh_of_smp_probe(void) ...@@ -80,6 +80,7 @@ static void sh_of_smp_probe(void)
if (!method) { if (!method) {
np = of_find_node_by_name(NULL, "cpus"); np = of_find_node_by_name(NULL, "cpus");
of_property_read_string(np, "enable-method", &method); of_property_read_string(np, "enable-method", &method);
of_node_put(np);
} }
pr_info("CPU enable method: %s\n", method); pr_info("CPU enable method: %s\n", method);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment