diff options
author | Jeremy Kerr <jk@ozlabs.org> | 2006-07-12 01:42:06 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 01:55:06 -0400 |
commit | 931b261f442e779b0656d9b04c7ffe4939ef8c0a (patch) | |
tree | 76d650707d78ed7c9e002481001ac175c8502d8e | |
parent | 88c805940bb9a1478f06ed6dd5d6f660bdc38eaa (diff) |
[POWERPC] Make get_property() return a const void *
Previous changes have treated the return values of get_property as
const, so now we can make the actual change to get_property(). There
shouldn't be a need to cast the return values anymore.
We will now get compiler warnings when property values are assigned to
a non-const variable.
If properties need to be updated, there's still the of_find_property
function.
Built for cell_defconfig, chrp32_defconfig, g5_defconfig,
iseries_defconfig, maple_defconfig, pmac32_defconfig, ppc64_defconfig
and pseries_defconfig.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r-- | arch/powerpc/kernel/prom.c | 2 | ||||
-rw-r--r-- | include/asm-powerpc/prom.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index 2a3d84a39cb5..bf2005b2feb6 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c | |||
@@ -1527,7 +1527,7 @@ struct property *of_find_property(struct device_node *np, const char *name, | |||
1527 | * Find a property with a given name for a given node | 1527 | * Find a property with a given name for a given node |
1528 | * and return the value. | 1528 | * and return the value. |
1529 | */ | 1529 | */ |
1530 | void *get_property(struct device_node *np, const char *name, int *lenp) | 1530 | const void *get_property(struct device_node *np, const char *name, int *lenp) |
1531 | { | 1531 | { |
1532 | struct property *pp = of_find_property(np,name,lenp); | 1532 | struct property *pp = of_find_property(np,name,lenp); |
1533 | return pp ? pp->value : NULL; | 1533 | return pp ? pp->value : NULL; |
diff --git a/include/asm-powerpc/prom.h b/include/asm-powerpc/prom.h index abdf1be66e97..31bfea4686a6 100644 --- a/include/asm-powerpc/prom.h +++ b/include/asm-powerpc/prom.h | |||
@@ -160,7 +160,7 @@ extern void unflatten_device_tree(void); | |||
160 | extern void early_init_devtree(void *); | 160 | extern void early_init_devtree(void *); |
161 | extern int device_is_compatible(struct device_node *device, const char *); | 161 | extern int device_is_compatible(struct device_node *device, const char *); |
162 | extern int machine_is_compatible(const char *compat); | 162 | extern int machine_is_compatible(const char *compat); |
163 | extern void *get_property(struct device_node *node, const char *name, | 163 | extern const void *get_property(struct device_node *node, const char *name, |
164 | int *lenp); | 164 | int *lenp); |
165 | extern void print_properties(struct device_node *node); | 165 | extern void print_properties(struct device_node *node); |
166 | extern int prom_n_addr_cells(struct device_node* np); | 166 | extern int prom_n_addr_cells(struct device_node* np); |