Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[karo-tx-linux.git] / drivers / macintosh / windfarm_rm31.c

diff --git a/drivers/macintosh/windfarm_rm31.c b/drivers/macintosh/windfarm_rm31.c
index 844003fb4ef0d798001660e8ab8c58ad6d85354f..0b9a79b2f48aaded2397762ce500b032f25f77e1 100644 (file)
--- a/drivers/macintosh/windfarm_rm31.c
+++ b/drivers/macintosh/windfarm_rm31.c
@@ -696,7 +696,7 @@ static int __init wf_rm31_init(void)
 
        /* Count the number of CPU cores */
        nr_chips = 0;
-       for (cpu = NULL; (cpu = of_find_node_by_type(cpu, "cpu")) != NULL; )
+       for_each_node_by_type(cpu, "cpu")
                ++nr_chips;
        if (nr_chips > NR_CHIPS)
                nr_chips = NR_CHIPS;