Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d121aac authored by Marco Felsch's avatar Marco Felsch Committed by Greg Kroah-Hartman
Browse files

media: v4l2-fwnode: simplify v4l2_fwnode_parse_link 



[ Upstream commit 507a0ba93aa1cf2837d2abc4ab0cbad3c29409d3 ]

This helper was introduced before those helpers where awailable. Convert
it to cleanup the code and improbe readability.

Signed-off-by: default avatarMarco Felsch <m.felsch@pengutronix.de>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Stable-dep-of: d7b13edd4cb4 ("media: v4l2-core: Fix a potential resource leak in v4l2_fwnode_parse_link()")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ad535807

drivers/media/v4l2-core/v4l2-fwnode.c

+9 −16
Original line number Diff line number Diff line
@@ -279,33 +279,26 @@ struct v4l2_fwnode_endpoint *v4l2_fwnode_endpoint_alloc_parse( 
}

EXPORT_SYMBOL_GPL(v4l2_fwnode_endpoint_alloc_parse);



int v4l2_fwnode_parse_link(struct fwnode_handle *__fwnode,

int v4l2_fwnode_parse_link(struct fwnode_handle *fwnode,

			   struct v4l2_fwnode_link *link)

{

	const char *port_prop = "reg";

	struct fwnode_handle *fwnode;

	struct fwnode_endpoint fwep;



	memset(link, 0, sizeof(*link));



	fwnode = fwnode_get_parent(__fwnode);

	fwnode_property_read_u32(fwnode, port_prop, &link->local_port);

	fwnode = fwnode_get_next_parent(fwnode);

	if (is_of_node(fwnode) && of_node_name_eq(to_of_node(fwnode), "ports"))

		fwnode = fwnode_get_next_parent(fwnode);

	link->local_node = fwnode;

	fwnode_graph_parse_endpoint(fwnode, &fwep);

	link->local_port = fwep.port;

	link->local_node = fwnode_graph_get_port_parent(fwnode);



	fwnode = fwnode_graph_get_remote_endpoint(__fwnode);

	fwnode = fwnode_graph_get_remote_endpoint(fwnode);

	if (!fwnode) {

		fwnode_handle_put(fwnode);

		return -ENOLINK;

	}



	fwnode = fwnode_get_parent(fwnode);

	fwnode_property_read_u32(fwnode, port_prop, &link->remote_port);

	fwnode = fwnode_get_next_parent(fwnode);

	if (is_of_node(fwnode) && of_node_name_eq(to_of_node(fwnode), "ports"))

		fwnode = fwnode_get_next_parent(fwnode);

	link->remote_node = fwnode;

	fwnode_graph_parse_endpoint(fwnode, &fwep);

	link->remote_port = fwep.port;

	link->remote_node = fwnode_graph_get_port_parent(fwnode);



	return 0;

}