Merge tag 'devprop-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull device properties framework updates from Rafael Wysocki: "These make the fwnode_handle_get() function return a pointer to the target fwnode object, which reflects the of_node_get() behavior, and add a macro for iterating over graph endpoints (Sakari Ailus)" * tag 'devprop-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: device property: Add a macro for interating over graph endpoints device property: Make fwnode_handle_get() return the fwnode
This commit is contained in:
@@ -1044,10 +1044,15 @@ EXPORT_SYMBOL_GPL(device_get_named_child_node);
|
||||
/**
|
||||
* fwnode_handle_get - Obtain a reference to a device node
|
||||
* @fwnode: Pointer to the device node to obtain the reference to.
|
||||
*
|
||||
* Returns the fwnode handle.
|
||||
*/
|
||||
void fwnode_handle_get(struct fwnode_handle *fwnode)
|
||||
struct fwnode_handle *fwnode_handle_get(struct fwnode_handle *fwnode)
|
||||
{
|
||||
fwnode_call_void_op(fwnode, get);
|
||||
if (!fwnode_has_op(fwnode, get))
|
||||
return fwnode;
|
||||
|
||||
return fwnode_call_ptr_op(fwnode, get);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(fwnode_handle_get);
|
||||
|
||||
|
||||
@@ -817,9 +817,9 @@ struct device_node *of_graph_get_remote_node(const struct device_node *node,
|
||||
}
|
||||
EXPORT_SYMBOL(of_graph_get_remote_node);
|
||||
|
||||
static void of_fwnode_get(struct fwnode_handle *fwnode)
|
||||
static struct fwnode_handle *of_fwnode_get(struct fwnode_handle *fwnode)
|
||||
{
|
||||
of_node_get(to_of_node(fwnode));
|
||||
return of_fwnode_handle(of_node_get(to_of_node(fwnode)));
|
||||
}
|
||||
|
||||
static void of_fwnode_put(struct fwnode_handle *fwnode)
|
||||
|
||||
@@ -68,7 +68,7 @@ struct fwnode_reference_args {
|
||||
* @graph_parse_endpoint: Parse endpoint for port and endpoint id.
|
||||
*/
|
||||
struct fwnode_operations {
|
||||
void (*get)(struct fwnode_handle *fwnode);
|
||||
struct fwnode_handle *(*get)(struct fwnode_handle *fwnode);
|
||||
void (*put)(struct fwnode_handle *fwnode);
|
||||
bool (*device_is_available)(const struct fwnode_handle *fwnode);
|
||||
bool (*property_present)(const struct fwnode_handle *fwnode,
|
||||
|
||||
@@ -100,7 +100,7 @@ struct fwnode_handle *fwnode_get_named_child_node(
|
||||
struct fwnode_handle *device_get_named_child_node(struct device *dev,
|
||||
const char *childname);
|
||||
|
||||
void fwnode_handle_get(struct fwnode_handle *fwnode);
|
||||
struct fwnode_handle *fwnode_handle_get(struct fwnode_handle *fwnode);
|
||||
void fwnode_handle_put(struct fwnode_handle *fwnode);
|
||||
|
||||
unsigned int device_get_child_node_count(struct device *dev);
|
||||
@@ -293,6 +293,10 @@ struct fwnode_handle *
|
||||
fwnode_graph_get_remote_node(const struct fwnode_handle *fwnode, u32 port,
|
||||
u32 endpoint);
|
||||
|
||||
#define fwnode_graph_for_each_endpoint(fwnode, child) \
|
||||
for (child = NULL; \
|
||||
(child = fwnode_graph_get_next_endpoint(fwnode, child)); )
|
||||
|
||||
int fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode,
|
||||
struct fwnode_endpoint *endpoint);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user