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

Commit d3b814bb authored by Michael Ellerman's avatar Michael Ellerman Committed by Paul Mackerras
Browse files

[POWERPC] Generalise device_node flag interface 



The struct device_node currently has a _flags variable, although
it's only used for one flag - OF_DYNAMIC.  Generalise the flag
accessors so we can use them with other flags in future.

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 972d17c9

arch/powerpc/kernel/prom.c

+1 −1
Original line number Diff line number Diff line
@@ -1375,7 +1375,7 @@ static void of_node_release(struct kref *kref) 
	struct device_node *node = kref_to_device_node(kref);

	struct property *prop = node->properties;



	if (!OF_IS_DYNAMIC(node))

	if (!of_node_check_flag(node, OF_DYNAMIC))

		return;

	while (prop) {

		struct property *next = prop->next;

arch/powerpc/platforms/pseries/reconfig.c

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ static int pSeries_reconfig_add_node(const char *path, struct property *proplist 
	strcpy(np->full_name, path);



	np->properties = proplist;

	OF_MARK_DYNAMIC(np);

	of_node_set_flag(np, OF_DYNAMIC);

	kref_init(&np->kref);



	np->parent = derive_parent(path);

include/asm-powerpc/prom.h

+11 −3
Original line number Diff line number Diff line
@@ -100,8 +100,16 @@ extern struct device_node *of_chosen; 
/* flag descriptions */

#define OF_DYNAMIC	1 /* node and properties were allocated via kmalloc */



#define OF_IS_DYNAMIC(x) test_bit(OF_DYNAMIC, &x->_flags)

#define OF_MARK_DYNAMIC(x) set_bit(OF_DYNAMIC, &x->_flags)

static inline int of_node_check_flag(struct device_node *n, unsigned long flag)

{

	return test_bit(flag, &n->_flags);

}



static inline void of_node_set_flag(struct device_node *n, unsigned long flag)

{

	set_bit(flag, &n->_flags);

}





#define HAVE_ARCH_DEVTREE_FIXUPS