Skip to content

Commit

Permalink
Revert "media: device property: Call fwnode_graph_get_endpoint_by_id(…
Browse files Browse the repository at this point in the history
…) for fwnode->secondary"

This reverts commit acd418b. 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>
  • Loading branch information
Daniel Scally authored and Rafael J. Wysocki committed Aug 16, 2021
1 parent b5b41ab commit a908877
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions drivers/base/property.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit a908877

Please sign in to comment.