diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2006-06-29 20:28:18 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-07-03 08:56:33 +1000 |
| commit | a1af5b2fd49eb24ab8c024da5d853b09841d1f8f (patch) | |
| tree | a475482232e15282a2d212bbe9ccc10ac5d06234 | |
| parent | 4ebd9ab387b39c44165cd296a6637082a4f0f66a (diff) | |
| download | blackbird-op-linux-a1af5b2fd49eb24ab8c024da5d853b09841d1f8f.tar.gz blackbird-op-linux-a1af5b2fd49eb24ab8c024da5d853b09841d1f8f.zip | |
[POWERPC] change get_property to return void *
Change the get_property() function to return a void *. This allows us
to later remove the cast done in the majority of callers.
Built for pseries, iseries, pmac32, cell, cbesim, g5, systemsim, maple,
and mpc* defconfigs
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/powerpc/kernel/prom.c | 3 | ||||
| -rw-r--r-- | include/asm-powerpc/prom.h | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index 4c524cb52184..ef3619c28702 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c @@ -1975,8 +1975,7 @@ struct property *of_find_property(struct device_node *np, const char *name, * Find a property with a given name for a given node * and return the value. */ -unsigned char *get_property(struct device_node *np, const char *name, - int *lenp) +void *get_property(struct device_node *np, const char *name, int *lenp) { struct property *pp = of_find_property(np,name,lenp); return pp ? pp->value : NULL; diff --git a/include/asm-powerpc/prom.h b/include/asm-powerpc/prom.h index 010d186d095b..b0768f474809 100644 --- a/include/asm-powerpc/prom.h +++ b/include/asm-powerpc/prom.h @@ -167,8 +167,8 @@ extern void unflatten_device_tree(void); extern void early_init_devtree(void *); extern int device_is_compatible(struct device_node *device, const char *); extern int machine_is_compatible(const char *compat); -extern unsigned char *get_property(struct device_node *node, const char *name, - int *lenp); +extern void *get_property(struct device_node *node, const char *name, + int *lenp); extern void print_properties(struct device_node *node); extern int prom_n_addr_cells(struct device_node* np); extern int prom_n_size_cells(struct device_node* np); |
