Skip to content

Commit a908877

Browse files
djrscallyrafaeljw
authored andcommitted
Revert "media: device property: Call fwnode_graph_get_endpoint_by_id() 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>
1 parent b5b41ab commit a908877

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

drivers/base/property.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1231,14 +1231,7 @@ fwnode_graph_get_endpoint_by_id(const struct fwnode_handle *fwnode,
12311231
best_ep_id = fwnode_ep.id;
12321232
}
12331233

1234-
if (best_ep)
1235-
return best_ep;
1236-
1237-
if (fwnode && !IS_ERR_OR_NULL(fwnode->secondary))
1238-
return fwnode_graph_get_endpoint_by_id(fwnode->secondary, port,
1239-
endpoint, flags);
1240-
1241-
return NULL;
1234+
return best_ep;
12421235
}
12431236
EXPORT_SYMBOL_GPL(fwnode_graph_get_endpoint_by_id);
12441237

0 commit comments

Comments
 (0)