aboutsummaryrefslogtreecommitdiffstats
path: root/arch/riscv
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2019-01-18 15:03:08 +0100
committerPalmer Dabbelt <palmer@sifive.com>2019-02-11 15:35:52 -0800
commitdd81c8ab819d360c92703564d0a8d0b9d4688267 (patch)
tree4d5eaae0898169bcf6ad4bf577988b810f3683b1 /arch/riscv
parentriscv: treat cpu devicetree nodes without status as enabled (diff)
downloadlinux-dev-dd81c8ab819d360c92703564d0a8d0b9d4688267.tar.xz
linux-dev-dd81c8ab819d360c92703564d0a8d0b9d4688267.zip
riscv: use for_each_of_cpu_node iterator
Use the new for_each_of_cpu_node() helper to iterate over cpu nodes instead of open coding. Note that this will allow matching also on the node name instead of the (for FDT) deprecated device_type property. Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
Diffstat (limited to 'arch/riscv')
-rw-r--r--arch/riscv/kernel/cpufeature.c5
-rw-r--r--arch/riscv/kernel/smpboot.c4
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/riscv/kernel/cpufeature.c b/arch/riscv/kernel/cpufeature.c
index 4891fd62b95e..e7a4701f0256 100644
--- a/arch/riscv/kernel/cpufeature.c
+++ b/arch/riscv/kernel/cpufeature.c
@@ -28,7 +28,7 @@ bool has_fpu __read_mostly;
void riscv_fill_hwcap(void)
{
- struct device_node *node = NULL;
+ struct device_node *node;
const char *isa;
size_t i;
static unsigned long isa2hwcap[256] = {0};
@@ -46,9 +46,10 @@ void riscv_fill_hwcap(void)
* We don't support running Linux on hertergenous ISA systems. For
* now, we just check the ISA of the first "okay" processor.
*/
- while ((node = of_find_node_by_type(node, "cpu")))
+ for_each_of_cpu_node(node) {
if (riscv_of_processor_hartid(node) >= 0)
break;
+ }
if (!node) {
pr_warn("Unable to find \"cpu\" devicetree entry\n");
return;
diff --git a/arch/riscv/kernel/smpboot.c b/arch/riscv/kernel/smpboot.c
index 18cda0e8cf94..6e2813257e03 100644
--- a/arch/riscv/kernel/smpboot.c
+++ b/arch/riscv/kernel/smpboot.c
@@ -50,12 +50,12 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
void __init setup_smp(void)
{
- struct device_node *dn = NULL;
+ struct device_node *dn;
int hart;
bool found_boot_cpu = false;
int cpuid = 1;
- while ((dn = of_find_node_by_type(dn, "cpu"))) {
+ for_each_of_cpu_node(dn) {
hart = riscv_of_processor_hartid(dn);
if (hart < 0)
continue;