of: property: Fix the semantics of of_is_ancestor_of()
diff mbox series

Message ID 20191120080230.16007-1-saravanak@google.com
State Accepted
Commit 3883539140b8ce67ad000938c3cd3b3e59498520
Headers show
Series
  • of: property: Fix the semantics of of_is_ancestor_of()
Related show

Commit Message

Saravana Kannan Nov. 20, 2019, 8:02 a.m. UTC
The of_is_ancestor_of() function was renamed from of_link_is_valid()
based on review feedback. The rename meant the semantics of the function
had to be inverted, but this was missed in the earlier patch.

So, fix the semantics of of_is_ancestor_of() and invert the conditional
expressions where it is used.

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Saravana Kannan <saravanak@google.com>
---
 drivers/of/property.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Greg Kroah-Hartman Nov. 20, 2019, 3:36 p.m. UTC | #1
On Wed, Nov 20, 2019 at 12:02:29AM -0800, Saravana Kannan wrote:
> The of_is_ancestor_of() function was renamed from of_link_is_valid()
> based on review feedback. The rename meant the semantics of the function
> had to be inverted, but this was missed in the earlier patch.
> 
> So, fix the semantics of of_is_ancestor_of() and invert the conditional
> expressions where it is used.
> 
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Signed-off-by: Saravana Kannan <saravanak@google.com>
> ---
>  drivers/of/property.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

What git commit does this patch fix?

thanks,

greg k-h
Saravana Kannan Nov. 20, 2019, 9:50 p.m. UTC | #2
On Wed, Nov 20, 2019 at 7:36 AM Greg Kroah-Hartman
<gregkh@linuxfoundation.org> wrote:
>
> On Wed, Nov 20, 2019 at 12:02:29AM -0800, Saravana Kannan wrote:
> > The of_is_ancestor_of() function was renamed from of_link_is_valid()
> > based on review feedback. The rename meant the semantics of the function
> > had to be inverted, but this was missed in the earlier patch.
> >
> > So, fix the semantics of of_is_ancestor_of() and invert the conditional
> > expressions where it is used.
> >
> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > Signed-off-by: Saravana Kannan <saravanak@google.com>
> > ---
> >  drivers/of/property.c | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
>
> What git commit does this patch fix?
>

Fixes commit a3e1d1a7f5fcc. Let me know if you want me to send a v2 or
if you can fix up the commit text on your end.

Thanks,
Saravana


-Saravana
Greg Kroah-Hartman Nov. 21, 2019, noon UTC | #3
On Wed, Nov 20, 2019 at 01:50:42PM -0800, Saravana Kannan wrote:
> On Wed, Nov 20, 2019 at 7:36 AM Greg Kroah-Hartman
> <gregkh@linuxfoundation.org> wrote:
> >
> > On Wed, Nov 20, 2019 at 12:02:29AM -0800, Saravana Kannan wrote:
> > > The of_is_ancestor_of() function was renamed from of_link_is_valid()
> > > based on review feedback. The rename meant the semantics of the function
> > > had to be inverted, but this was missed in the earlier patch.
> > >
> > > So, fix the semantics of of_is_ancestor_of() and invert the conditional
> > > expressions where it is used.
> > >
> > > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > > Signed-off-by: Saravana Kannan <saravanak@google.com>
> > > ---
> > >  drivers/of/property.c | 6 +++---
> > >  1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > What git commit does this patch fix?
> >
> 
> Fixes commit a3e1d1a7f5fcc. Let me know if you want me to send a v2 or
> if you can fix up the commit text on your end.

I'll fix it up.

Patch
diff mbox series

diff --git a/drivers/of/property.c b/drivers/of/property.c
index dedbf82da838..0de1e7e69b6e 100644
--- a/drivers/of/property.c
+++ b/drivers/of/property.c
@@ -993,11 +993,11 @@  static bool of_is_ancestor_of(struct device_node *test_ancestor,
 	while (child) {
 		if (child == test_ancestor) {
 			of_node_put(child);
-			return false;
+			return true;
 		}
 		child = of_get_next_parent(child);
 	}
-	return true;
+	return false;
 }
 
 /**
@@ -1043,7 +1043,7 @@  static int of_link_to_phandle(struct device *dev, struct device_node *sup_np,
 	 * descendant nodes. By definition, a child node can't be a functional
 	 * dependency for the parent node.
 	 */
-	if (!of_is_ancestor_of(dev->of_node, sup_np)) {
+	if (of_is_ancestor_of(dev->of_node, sup_np)) {
 		dev_dbg(dev, "Not linking to %pOFP - is descendant\n", sup_np);
 		of_node_put(sup_np);
 		return -EINVAL;