From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Return-Path: Sender: Grant Likely From: Grant Likely Subject: Re: [PATCH 2/6] OF: Add [__]of_find_node_by_full_name In-Reply-To: <1403430039-15085-3-git-send-email-pantelis.antoniou@konsulko.com> References: <1403430039-15085-1-git-send-email-pantelis.antoniou@konsulko.com> <1403430039-15085-3-git-send-email-pantelis.antoniou@konsulko.com> Date: Tue, 24 Jun 2014 15:12:13 +0100 Message-Id: <20140624141213.33995C40B84@trevor.secretlab.ca> To: Pantelis Antoniou Cc: Rob Herring , Stephen Warren , Matt Porter , Koen Kooi , Greg Kroah-Hartman , Alison Chaiken , Dinh Nguyen , Jan Lubbe , Alexander Sverdlin , Michael Stickel , Guenter Roeck , Dirk Behme , Alan Tull , Sascha Hauer , Michael Bohan , Ionut Nicu , Michal Simek , Matt Ranostay , Joel Becker , devicetree@vger.kernel.org, Wolfram Sang , linux-i2c@vger.kernel.org, Mark Brown , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Pete Popov , Dan Malek , Georgi Vlaev , Pantelis Antoniou List-ID: On Sun, 22 Jun 2014 12:40:35 +0300, Pantelis Antoniou wrote: > __of_find_node_by_full_name recursively searches for a matching node > with the given full name without taking any locks. > > of_find_node_by_full_name takes locks and takes a reference on the > matching node. > > Signed-off-by: Pantelis Antoniou The only user of this turns out to be the resolver. No need to export it or advertise it in include/linux/of.h. I don't want drive-by users. Move it to the resolver.c file. g. > --- > drivers/of/base.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ > include/linux/of.h | 4 ++++ > 2 files changed, 62 insertions(+) > > diff --git a/drivers/of/base.c b/drivers/of/base.c > index d3493e1..80fef33 100644 > --- a/drivers/of/base.c > +++ b/drivers/of/base.c > @@ -1201,6 +1201,64 @@ static void *of_find_property_value_of_size(const struct device_node *np, > } > > /** > + * __of_find_node_by_full_name - Find a node with the full name recursively > + * @node: Root of the tree to perform the search > + * @full_name: Full name of the node to find. > + * > + * Find a node with the give full name by recursively following any of > + * the child node links. > + * Returns the matching node, or NULL if not found. > + * Note that the devtree lock is not taken, so this function is only > + * safe to call on either detached trees, or when devtree lock is already > + * taken. > + */ > +struct device_node *__of_find_node_by_full_name(struct device_node *node, > + const char *full_name) > +{ > + struct device_node *child, *found; > + > + if (node == NULL) > + return NULL; > + > + /* check */ > + if (of_node_cmp(node->full_name, full_name) == 0) > + return node; > + > + __for_each_child_of_node(node, child) { > + found = __of_find_node_by_full_name(child, full_name); > + if (found != NULL) > + return found; > + } > + > + return NULL; > +} > +EXPORT_SYMBOL(__of_find_node_by_full_name); > + > +/** > + * of_find_node_by_full_name - Find a node with the full name recursively > + * @node: Root of the tree to perform the search > + * @full_name: Full name of the node to find. > + * > + * Find a node with the give full name by recursively following any of > + * the child node links. > + * Returns the matching node (with a ref taken), or NULL if not found. > + */ > +struct device_node *of_find_node_by_full_name(struct device_node *node, > + const char *full_name) > +{ > + unsigned long flags; > + struct device_node *np; > + > + raw_spin_lock_irqsave(&devtree_lock, flags); > + np = of_find_node_by_full_name(node, full_name); > + of_node_get(np); > + raw_spin_unlock_irqrestore(&devtree_lock, flags); > + > + return np; > +} > +EXPORT_SYMBOL(of_find_node_by_full_name); > + > +/** > * of_property_read_u32_index - Find and read a u32 from a multi-value property. > * > * @np: device node from which the property value is to be read. > diff --git a/include/linux/of.h b/include/linux/of.h > index 196b34c..f7392c0 100644 > --- a/include/linux/of.h > +++ b/include/linux/of.h > @@ -230,6 +230,10 @@ extern struct device_node *of_find_matching_node_and_match( > > extern struct device_node *of_find_node_by_path(const char *path); > extern struct device_node *of_find_node_by_phandle(phandle handle); > +struct device_node *__of_find_node_by_full_name(struct device_node *node, > + const char *full_name); > +struct device_node *of_find_node_by_full_name(struct device_node *node, > + const char *full_name); > extern struct device_node *of_get_parent(const struct device_node *node); > extern struct device_node *of_get_next_parent(struct device_node *node); > extern struct device_node *of_get_next_child(const struct device_node *node, > -- > 1.7.12 >