From d0e5a2724f52eacf5fc4fc016766c6d5ebc32a1b Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Sun, 2 Dec 2012 03:00:09 +0000 Subject: [PATCH] --- yaml --- r: 356357 b: refs/heads/master c: c7c360eedb8c1eea302a224a8c83d19a4e4cf608 h: refs/heads/master i: 356355: ed3c5f14a597f7bdabd1abfc50bf3f118e1c0273 v: v3 --- [refs] | 2 +- trunk/drivers/macintosh/windfarm_pm112.c | 2 +- trunk/drivers/macintosh/windfarm_pm72.c | 2 +- trunk/drivers/macintosh/windfarm_rm31.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6d07070f3088..3cae484a487e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e253ebab935693cc2eafbc93e94b68b47dc779db +refs/heads/master: c7c360eedb8c1eea302a224a8c83d19a4e4cf608 diff --git a/trunk/drivers/macintosh/windfarm_pm112.c b/trunk/drivers/macintosh/windfarm_pm112.c index 35ef6e2582b8..3024685e4cca 100644 --- a/trunk/drivers/macintosh/windfarm_pm112.c +++ b/trunk/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"); diff --git a/trunk/drivers/macintosh/windfarm_pm72.c b/trunk/drivers/macintosh/windfarm_pm72.c index 6e5585357cd3..2f506b9d5a52 100644 --- a/trunk/drivers/macintosh/windfarm_pm72.c +++ b/trunk/drivers/macintosh/windfarm_pm72.c @@ -804,7 +804,7 @@ static int __init wf_pm72_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; diff --git a/trunk/drivers/macintosh/windfarm_rm31.c b/trunk/drivers/macintosh/windfarm_rm31.c index 844003fb4ef0..0b9a79b2f48a 100644 --- a/trunk/drivers/macintosh/windfarm_rm31.c +++ b/trunk/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;