Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1af5b2f authored by Jeremy Kerr's avatar Jeremy Kerr Committed by Paul Mackerras
Browse files

[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: default avatarJeremy Kerr <jk@ozlabs.org>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 4ebd9ab3

arch/powerpc/kernel/prom.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

include/asm-powerpc/prom.h

+2 −2
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ 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,

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);