| Message ID | 20211006164332.1981454-10-robh@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | DT: CPU h/w id parsing clean-ups and cacheinfo id support | expand |
On Wed, Oct 06, 2021 at 11:43:29AM -0500, Rob Herring wrote: > Replace open coded parsing of CPU nodes' 'reg' property with > of_get_cpu_hwid(). > > Cc: Yoshinori Sato <ysato@users.sourceforge.jp> > Cc: Rich Felker <dalias@libc.org> > Cc: linux-sh@vger.kernel.org > Signed-off-by: Rob Herring <robh@kernel.org> > --- > arch/sh/boards/of-generic.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/arch/sh/boards/of-generic.c b/arch/sh/boards/of-generic.c > index 921d76fc3358..f7f3e618e85b 100644 > --- a/arch/sh/boards/of-generic.c > +++ b/arch/sh/boards/of-generic.c > @@ -62,9 +62,8 @@ static void sh_of_smp_probe(void) > init_cpu_possible(cpumask_of(0)); > > for_each_of_cpu_node(np) { > - const __be32 *cell = of_get_property(np, "reg", NULL); > - u64 id = -1; > - if (cell) id = of_read_number(cell, of_n_addr_cells(np)); > + u64 id = of_get_cpu_hwid(np, 0); > + > if (id < NR_CPUS) { > if (!method) > of_property_read_string(np, "enable-method", &method); > -- > 2.30.2 Acked-by: Rich Felker <dalias@libc.org>
diff --git a/arch/sh/boards/of-generic.c b/arch/sh/boards/of-generic.c index 921d76fc3358..f7f3e618e85b 100644 --- a/arch/sh/boards/of-generic.c +++ b/arch/sh/boards/of-generic.c @@ -62,9 +62,8 @@ static void sh_of_smp_probe(void) init_cpu_possible(cpumask_of(0)); for_each_of_cpu_node(np) { - const __be32 *cell = of_get_property(np, "reg", NULL); - u64 id = -1; - if (cell) id = of_read_number(cell, of_n_addr_cells(np)); + u64 id = of_get_cpu_hwid(np, 0); + if (id < NR_CPUS) { if (!method) of_property_read_string(np, "enable-method", &method);
Replace open coded parsing of CPU nodes' 'reg' property with of_get_cpu_hwid(). Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Cc: Rich Felker <dalias@libc.org> Cc: linux-sh@vger.kernel.org Signed-off-by: Rob Herring <robh@kernel.org> --- arch/sh/boards/of-generic.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)