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

Commit d1cd355a authored by Stephen Rothwell's avatar Stephen Rothwell
Browse files

Consolidate of_get_next_child 



This adds a read_lock around the child/next accesses on Sparc.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Acked-by: default avatarPaul Mackerras <paulus@samba.org>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e679c5f4

arch/powerpc/kernel/prom.c

+0 −24
Original line number Diff line number Diff line
@@ -1240,30 +1240,6 @@ struct device_node *of_find_all_nodes(struct device_node *prev) 
}

EXPORT_SYMBOL(of_find_all_nodes);



/**

 *	of_get_next_child - Iterate a node childs

 *	@node:	parent node

 *	@prev:	previous child of the parent node, or NULL to get first

 *

 *	Returns a node pointer with refcount incremented, use

 *	of_node_put() on it when done.

 */

struct device_node *of_get_next_child(const struct device_node *node,

	struct device_node *prev)

{

	struct device_node *next;



	read_lock(&devtree_lock);

	next = prev ? prev->sibling : node->child;

	for (; next != 0; next = next->sibling)

		if (of_node_get(next))

			break;

	of_node_put(prev);

	read_unlock(&devtree_lock);

	return next;

}

EXPORT_SYMBOL(of_get_next_child);



/**

 *	of_node_get - Increment refcount of a node

 *	@node:	Node to inc refcount, NULL is supported to

arch/sparc/kernel/prom.c

+0 −14
Original line number Diff line number Diff line
@@ -29,20 +29,6 @@ static struct device_node *allnodes; 


extern rwlock_t devtree_lock;	/* temporary while merging */



struct device_node *of_get_next_child(const struct device_node *node,

	struct device_node *prev)

{

	struct device_node *next;



	next = prev ? prev->sibling : node->child;

	for (; next != 0; next = next->sibling) {

		break;

	}



	return next;

}

EXPORT_SYMBOL(of_get_next_child);



struct device_node *of_find_node_by_path(const char *path)

{

	struct device_node *np = allnodes;

arch/sparc64/kernel/prom.c

+0 −14
Original line number Diff line number Diff line
@@ -34,20 +34,6 @@ static struct device_node *allnodes; 


extern rwlock_t devtree_lock;	/* temporary while merging */



struct device_node *of_get_next_child(const struct device_node *node,

	struct device_node *prev)

{

	struct device_node *next;



	next = prev ? prev->sibling : node->child;

	for (; next != 0; next = next->sibling) {

		break;

	}



	return next;

}

EXPORT_SYMBOL(of_get_next_child);



struct device_node *of_find_node_by_path(const char *path)

{

	struct device_node *np = allnodes;

drivers/of/base.c

+24 −0
Original line number Diff line number Diff line
@@ -134,3 +134,27 @@ struct device_node *of_get_parent(const struct device_node *node) 
	return np;

}

EXPORT_SYMBOL(of_get_parent);



/**

 *	of_get_next_child - Iterate a node childs

 *	@node:	parent node

 *	@prev:	previous child of the parent node, or NULL to get first

 *

 *	Returns a node pointer with refcount incremented, use

 *	of_node_put() on it when done.

 */

struct device_node *of_get_next_child(const struct device_node *node,

	struct device_node *prev)

{

	struct device_node *next;



	read_lock(&devtree_lock);

	next = prev ? prev->sibling : node->child;

	for (; next; next = next->sibling)

		if (of_node_get(next))

			break;

	of_node_put(prev);

	read_unlock(&devtree_lock);

	return next;

}

EXPORT_SYMBOL(of_get_next_child);