aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/setup_64.c
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2006-07-12 01:35:54 -0400
committerPaul Mackerras <paulus@samba.org>2006-07-31 01:55:04 -0400
commita7f67bdf2c9f24509b8e81e0f35573b611987c80 (patch)
tree201662dd6504418ef3c84cfe1f280153a4d8cb29 /arch/powerpc/kernel/setup_64.c
parent4288b92b9644fdb4c6168273873fe08f32090d7a (diff)
[POWERPC] Constify & voidify get_property()
Now that get_property() returns a void *, there's no need to cast its return value. Also, treat the return value as const, so we can constify get_property later. powerpc core changes. Signed-off-by: Jeremy Kerr <jk@ozlabs.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/setup_64.c')
-rw-r--r--arch/powerpc/kernel/setup_64.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index e2447aef3a8f..77efe19ccd2c 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -106,7 +106,7 @@ static int smt_enabled_cmdline;
106static void check_smt_enabled(void) 106static void check_smt_enabled(void)
107{ 107{
108 struct device_node *dn; 108 struct device_node *dn;
109 char *smt_option; 109 const char *smt_option;
110 110
111 /* Allow the command line to overrule the OF option */ 111 /* Allow the command line to overrule the OF option */
112 if (smt_enabled_cmdline) 112 if (smt_enabled_cmdline)
@@ -115,7 +115,7 @@ static void check_smt_enabled(void)
115 dn = of_find_node_by_path("/options"); 115 dn = of_find_node_by_path("/options");
116 116
117 if (dn) { 117 if (dn) {
118 smt_option = (char *)get_property(dn, "ibm,smt-enabled", NULL); 118 smt_option = get_property(dn, "ibm,smt-enabled", NULL);
119 119
120 if (smt_option) { 120 if (smt_option) {
121 if (!strcmp(smt_option, "on")) 121 if (!strcmp(smt_option, "on"))
@@ -292,7 +292,7 @@ static void __init initialize_cache_info(void)
292 */ 292 */
293 293
294 if ( num_cpus == 1 ) { 294 if ( num_cpus == 1 ) {
295 u32 *sizep, *lsizep; 295 const u32 *sizep, *lsizep;
296 u32 size, lsize; 296 u32 size, lsize;
297 const char *dc, *ic; 297 const char *dc, *ic;
298 298
@@ -307,10 +307,10 @@ static void __init initialize_cache_info(void)
307 307
308 size = 0; 308 size = 0;
309 lsize = cur_cpu_spec->dcache_bsize; 309 lsize = cur_cpu_spec->dcache_bsize;
310 sizep = (u32 *)get_property(np, "d-cache-size", NULL); 310 sizep = get_property(np, "d-cache-size", NULL);
311 if (sizep != NULL) 311 if (sizep != NULL)
312 size = *sizep; 312 size = *sizep;
313 lsizep = (u32 *) get_property(np, dc, NULL); 313 lsizep = get_property(np, dc, NULL);
314 if (lsizep != NULL) 314 if (lsizep != NULL)
315 lsize = *lsizep; 315 lsize = *lsizep;
316 if (sizep == 0 || lsizep == 0) 316 if (sizep == 0 || lsizep == 0)
@@ -324,10 +324,10 @@ static void __init initialize_cache_info(void)
324 324
325 size = 0; 325 size = 0;
326 lsize = cur_cpu_spec->icache_bsize; 326 lsize = cur_cpu_spec->icache_bsize;
327 sizep = (u32 *)get_property(np, "i-cache-size", NULL); 327 sizep = get_property(np, "i-cache-size", NULL);
328 if (sizep != NULL) 328 if (sizep != NULL)
329 size = *sizep; 329 size = *sizep;
330 lsizep = (u32 *)get_property(np, ic, NULL); 330 lsizep = get_property(np, ic, NULL);
331 if (lsizep != NULL) 331 if (lsizep != NULL)
332 lsize = *lsizep; 332 lsize = *lsizep;
333 if (sizep == 0 || lsizep == 0) 333 if (sizep == 0 || lsizep == 0)