aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2007-04-23 23:51:59 -0400
committerPaul Mackerras <paulus@samba.org>2007-04-24 08:09:01 -0400
commit1658ab66781d918f604c6069c5cf9a94b6f52f84 (patch)
tree059e9b6ba2e893402fa9cf1a5e3ce47bf9095bfd /arch/powerpc/platforms
parent8c8dc322486d5394dc981bef9276dd0ce6c8d1ce (diff)
[POWERPC] Remove old interface find_type_devices
Replaced by of_find_node_by_type. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms')
-rw-r--r--arch/powerpc/platforms/chrp/setup.c6
-rw-r--r--arch/powerpc/platforms/powermac/cpufreq_32.c3
-rw-r--r--arch/powerpc/platforms/powermac/setup.c5
3 files changed, 9 insertions, 5 deletions
diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c
index e46c4d4a5804..9c1b231b1ff9 100644
--- a/arch/powerpc/platforms/chrp/setup.c
+++ b/arch/powerpc/platforms/chrp/setup.c
@@ -226,12 +226,12 @@ static void __init pegasos_set_l2cr(void)
226 return; 226 return;
227 227
228 /* Enable L2 cache if needed */ 228 /* Enable L2 cache if needed */
229 np = find_type_devices("cpu"); 229 np = of_find_node_by_type(NULL, "cpu");
230 if (np != NULL) { 230 if (np != NULL) {
231 const unsigned int *l2cr = of_get_property(np, "l2cr", NULL); 231 const unsigned int *l2cr = of_get_property(np, "l2cr", NULL);
232 if (l2cr == NULL) { 232 if (l2cr == NULL) {
233 printk ("Pegasos l2cr : no cpu l2cr property found\n"); 233 printk ("Pegasos l2cr : no cpu l2cr property found\n");
234 return; 234 goto out;
235 } 235 }
236 if (!((*l2cr) & 0x80000000)) { 236 if (!((*l2cr) & 0x80000000)) {
237 printk ("Pegasos l2cr : L2 cache was not active, " 237 printk ("Pegasos l2cr : L2 cache was not active, "
@@ -240,6 +240,8 @@ static void __init pegasos_set_l2cr(void)
240 _set_L2CR((*l2cr) | 0x80000000); 240 _set_L2CR((*l2cr) | 0x80000000);
241 } 241 }
242 } 242 }
243out:
244 of_node_put(np);
243} 245}
244 246
245static void briq_restart(char *cmd) 247static void briq_restart(char *cmd)
diff --git a/arch/powerpc/platforms/powermac/cpufreq_32.c b/arch/powerpc/platforms/powermac/cpufreq_32.c
index 76eda9fcd1aa..8943a9456bb7 100644
--- a/arch/powerpc/platforms/powermac/cpufreq_32.c
+++ b/arch/powerpc/platforms/powermac/cpufreq_32.c
@@ -658,7 +658,7 @@ static int __init pmac_cpufreq_setup(void)
658 return 0; 658 return 0;
659 659
660 /* Assume only one CPU */ 660 /* Assume only one CPU */
661 cpunode = find_type_devices("cpu"); 661 cpunode = of_find_node_by_type(NULL, "cpu");
662 if (!cpunode) 662 if (!cpunode)
663 goto out; 663 goto out;
664 664
@@ -708,6 +708,7 @@ static int __init pmac_cpufreq_setup(void)
708 else if (PVR_VER(mfspr(SPRN_PVR)) == 0x7000) 708 else if (PVR_VER(mfspr(SPRN_PVR)) == 0x7000)
709 pmac_cpufreq_init_750FX(cpunode); 709 pmac_cpufreq_init_750FX(cpunode);
710out: 710out:
711 of_node_put(cpunode);
711 if (set_speed_proc == NULL) 712 if (set_speed_proc == NULL)
712 return -ENODEV; 713 return -ENODEV;
713 714
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index 8c96f2461e9a..ae37d3e23783 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -250,9 +250,9 @@ static void __init l2cr_init(void)
250{ 250{
251 /* Checks "l2cr-value" property in the registry */ 251 /* Checks "l2cr-value" property in the registry */
252 if (cpu_has_feature(CPU_FTR_L2CR)) { 252 if (cpu_has_feature(CPU_FTR_L2CR)) {
253 struct device_node *np = find_devices("cpus"); 253 struct device_node *np = of_find_node_by_name(NULL, "cpus");
254 if (np == 0) 254 if (np == 0)
255 np = find_type_devices("cpu"); 255 np = of_find_node_by_type(NULL, "cpu");
256 if (np != 0) { 256 if (np != 0) {
257 const unsigned int *l2cr = 257 const unsigned int *l2cr =
258 of_get_property(np, "l2cr-value", NULL); 258 of_get_property(np, "l2cr-value", NULL);
@@ -262,6 +262,7 @@ static void __init l2cr_init(void)
262 _set_L2CR(0); 262 _set_L2CR(0);
263 _set_L2CR(ppc_override_l2cr_value); 263 _set_L2CR(ppc_override_l2cr_value);
264 } 264 }
265 of_node_put(np);
265 } 266 }
266 } 267 }
267 268