aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Ellerman <michael@ellerman.id.au>2007-10-26 02:54:31 -0400
committerPaul Mackerras <paulus@samba.org>2008-02-06 00:29:59 -0500
commitf4eb010706b6c96c136c7aaa9079159743f33fa8 (patch)
tree53be8d89ad0073f90b2975e780c0426249ee3f3e
parent58119068cb27ef7513f80aff44b62a3a8f40ef5f (diff)
[POWERPC] Add of_get_next_parent()
Iterating through a device node's parents is simple enough, but dealing with the refcounts properly is a little ugly, and replicating that logic is asking for someone to get it wrong or forget it all together, eg: while (dn != NULL) { /* loop body */ tmp = of_get_parent(dn); of_node_put(dn); dn = tmp; } So add of_get_next_parent(), inspired by of_get_next_child(). The contract is that it returns the parent and drops the reference on the current node, this makes the loop look like: while (dn != NULL) { /* loop body */ dn = of_get_next_parent(dn); } Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--drivers/of/base.c25
-rw-r--r--include/linux/of.h1
2 files changed, 26 insertions, 0 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c
index b306fef1ac41..80c9deca5f35 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -138,6 +138,31 @@ struct device_node *of_get_parent(const struct device_node *node)
138EXPORT_SYMBOL(of_get_parent); 138EXPORT_SYMBOL(of_get_parent);
139 139
140/** 140/**
141 * of_get_next_parent - Iterate to a node's parent
142 * @node: Node to get parent of
143 *
144 * This is like of_get_parent() except that it drops the
145 * refcount on the passed node, making it suitable for iterating
146 * through a node's parents.
147 *
148 * Returns a node pointer with refcount incremented, use
149 * of_node_put() on it when done.
150 */
151struct device_node *of_get_next_parent(struct device_node *node)
152{
153 struct device_node *parent;
154
155 if (!node)
156 return NULL;
157
158 read_lock(&devtree_lock);
159 parent = of_node_get(node->parent);
160 of_node_put(node);
161 read_unlock(&devtree_lock);
162 return parent;
163}
164
165/**
141 * of_get_next_child - Iterate a node childs 166 * of_get_next_child - Iterate a node childs
142 * @node: parent node 167 * @node: parent node
143 * @prev: previous child of the parent node, or NULL to get first 168 * @prev: previous child of the parent node, or NULL to get first
diff --git a/include/linux/of.h b/include/linux/of.h
index b5f33efcb8e2..6981016dcc25 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -50,6 +50,7 @@ extern struct device_node *of_find_matching_node(struct device_node *from,
50extern struct device_node *of_find_node_by_path(const char *path); 50extern struct device_node *of_find_node_by_path(const char *path);
51extern struct device_node *of_find_node_by_phandle(phandle handle); 51extern struct device_node *of_find_node_by_phandle(phandle handle);
52extern struct device_node *of_get_parent(const struct device_node *node); 52extern struct device_node *of_get_parent(const struct device_node *node);
53extern struct device_node *of_get_next_parent(struct device_node *node);
53extern struct device_node *of_get_next_child(const struct device_node *node, 54extern struct device_node *of_get_next_child(const struct device_node *node,
54 struct device_node *prev); 55 struct device_node *prev);
55#define for_each_child_of_node(parent, child) \ 56#define for_each_child_of_node(parent, child) \