diff options
| author | Daniel Scally <djrscally@gmail.com> | 2021-08-06 23:09:06 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-08-16 18:35:42 +0200 |
| commit | a90887705668fc5587bf5092c38f353ad36c69fd (patch) | |
| tree | ba8fddb0f7f5d20acb7537e4122565b3b0998814 | |
| parent | b5b41ab6b0c1bb70fe37a0d193006c969e3b5909 (diff) | |
Revert "media: device property: Call fwnode_graph_get_endpoint_by_id() for fwnode->secondary"devprop-5.15-rc1
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>
| -rw-r--r-- | drivers/base/property.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/base/property.c b/drivers/base/property.c index fcf1a3857bc4..453918eb7390 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); |