From: Daniel Scally <djrscally@gmail.com>
Date: Fri, 6 Aug 2021 22:09:06 +0000 (+0100)
Subject: Revert "media: device property: Call fwnode_graph_get_endpoint_by_id() for fwnode... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a90887705668fc5587bf5092c38f353ad36c69fd;p=linux.git

Revert "media: device property: Call fwnode_graph_get_endpoint_by_id() for fwnode->secondary"

This reverts commit acd418bfcfc415cf5e6414b6d1c6acfec850f290. Checking for
endpoints against fwnode->secondary in fwnode_graph_get_next_endpoint() is
a better way to do this since that function is also used in a bunch of
other places, for instance sensor drivers checking that they do have an
endpoint connected during probe.

This reversion depends on the previous patch in this series, "device property:
Check fwnode->secondary in fwnode_graph_get_next_endpoint()".

Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Daniel Scally <djrscally@gmail.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

diff --git a/drivers/base/property.c b/drivers/base/property.c
index fcf1a3857bc4b..453918eb7390c 100644
--- a/drivers/base/property.c
+++ b/drivers/base/property.c
@@ -1231,14 +1231,7 @@ fwnode_graph_get_endpoint_by_id(const struct fwnode_handle *fwnode,
 		best_ep_id = fwnode_ep.id;
 	}
 
-	if (best_ep)
-		return best_ep;
-
-	if (fwnode && !IS_ERR_OR_NULL(fwnode->secondary))
-		return fwnode_graph_get_endpoint_by_id(fwnode->secondary, port,
-						       endpoint, flags);
-
-	return NULL;
+	return best_ep;
 }
 EXPORT_SYMBOL_GPL(fwnode_graph_get_endpoint_by_id);