Merge branch 'linus' into core/urgent

[firefly-linux-kernel-4.4.55.git] / drivers / macintosh / windfarm_pm112.c

diff --git a/drivers/macintosh/windfarm_pm112.c b/drivers/macintosh/windfarm_pm112.c
index 35ef6e2582b85da123c9e0b9eb99889abc1b8b15..3024685e4cca553d16ad4cd893925343f0ca5ba1 100644 (file)
--- a/drivers/macintosh/windfarm_pm112.c
+++ b/drivers/macintosh/windfarm_pm112.c
@@ -681,7 +681,7 @@ static int __init wf_pm112_init(void)
 
        /* Count the number of CPU cores */
        nr_cores = 0;
-       for (cpu = NULL; (cpu = of_find_node_by_type(cpu, "cpu")) != NULL; )
+       for_each_node_by_type(cpu, "cpu")
                ++nr_cores;
 
        printk(KERN_INFO "windfarm: initializing for dual-core desktop G5\n");