diff options
author | Jeremy Kerr <jk@ozlabs.org> | 2006-07-12 01:35:54 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 01:55:04 -0400 |
commit | a7f67bdf2c9f24509b8e81e0f35573b611987c80 (patch) | |
tree | 201662dd6504418ef3c84cfe1f280153a4d8cb29 /arch/powerpc/kernel/machine_kexec_64.c | |
parent | 4288b92b9644fdb4c6168273873fe08f32090d7a (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/machine_kexec_64.c')
-rw-r--r-- | arch/powerpc/kernel/machine_kexec_64.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/machine_kexec_64.c index b438d45a068c..4efdaa9d3f43 100644 --- a/arch/powerpc/kernel/machine_kexec_64.c +++ b/arch/powerpc/kernel/machine_kexec_64.c | |||
@@ -33,8 +33,8 @@ int default_machine_kexec_prepare(struct kimage *image) | |||
33 | unsigned long begin, end; /* limits of segment */ | 33 | unsigned long begin, end; /* limits of segment */ |
34 | unsigned long low, high; /* limits of blocked memory range */ | 34 | unsigned long low, high; /* limits of blocked memory range */ |
35 | struct device_node *node; | 35 | struct device_node *node; |
36 | unsigned long *basep; | 36 | const unsigned long *basep; |
37 | unsigned int *sizep; | 37 | const unsigned int *sizep; |
38 | 38 | ||
39 | if (!ppc_md.hpte_clear_all) | 39 | if (!ppc_md.hpte_clear_all) |
40 | return -ENOENT; | 40 | return -ENOENT; |
@@ -74,10 +74,8 @@ int default_machine_kexec_prepare(struct kimage *image) | |||
74 | /* We also should not overwrite the tce tables */ | 74 | /* We also should not overwrite the tce tables */ |
75 | for (node = of_find_node_by_type(NULL, "pci"); node != NULL; | 75 | for (node = of_find_node_by_type(NULL, "pci"); node != NULL; |
76 | node = of_find_node_by_type(node, "pci")) { | 76 | node = of_find_node_by_type(node, "pci")) { |
77 | basep = (unsigned long *)get_property(node, "linux,tce-base", | 77 | basep = get_property(node, "linux,tce-base", NULL); |
78 | NULL); | 78 | sizep = get_property(node, "linux,tce-size", NULL); |
79 | sizep = (unsigned int *)get_property(node, "linux,tce-size", | ||
80 | NULL); | ||
81 | if (basep == NULL || sizep == NULL) | 79 | if (basep == NULL || sizep == NULL) |
82 | continue; | 80 | continue; |
83 | 81 | ||