Commit 1029939b authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab
Browse files

media: v4l: async: Simplify async sub-device fwnode matching 



V4L2 async sub-device matching originally used the device nodes only.
Endpoint nodes were taken into use instead as using the device nodes was
problematic for it was in some cases ambiguous which link might have been
in question.

There is however no need to use endpoint nodes on both sides, as the async
sub-device's fwnode can always be trivially obtained using
fwnode_graph_get_remote_endpoint() when needed while what counts is
whether or not the link is between two device nodes, i.e. the device nodes
match.

This will briefly break the adv748x driver but it will be fixed later in
the set, by patch "media: adv748x: Return to endpoint matching".

Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Tested-by: Philipp Zabel <p.zabel@pengutronix.de> # imx6qp
Tested-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> # rcar + adv746x
Tested-by: Aishwarya Kothari <aishwarya.kothari@toradex.com> # Apalis i.MX6Q with TC358743
Tested-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> # Renesas RZ/G2L SMARC
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent b6d42c35

drivers/media/i2c/adv748x/adv748x-csi2.c

+2 −3
Original line number Diff line number Diff line
@@ -296,13 +296,12 @@ int adv748x_csi2_init(struct adv748x_state *state, struct adv748x_csi2 *tx) 
	if (!is_tx_enabled(tx))

		return 0;



	/* FIXME: Do endpoint matching again! */



	adv748x_subdev_init(&tx->sd, state, &adv748x_csi2_ops,

			    MEDIA_ENT_F_VID_IF_BRIDGE,

			    is_txa(tx) ? "txa" : "txb");



	/* Ensure that matching is based upon the endpoint fwnodes */

	tx->sd.fwnode = of_fwnode_handle(state->endpoints[tx->port]);



	/* Register internal ops for incremental subdev registration */

	tx->sd.internal_ops = &adv748x_csi2_internal_ops;

drivers/media/i2c/max9286.c

+1 −13
Original line number Diff line number Diff line
@@ -1051,7 +1051,6 @@ static const struct v4l2_ctrl_ops max9286_ctrl_ops = { 
static int max9286_v4l2_register(struct max9286_priv *priv)

{

	struct device *dev = &priv->client->dev;

	struct fwnode_handle *ep;

	int ret;

	int i;
@@ -1093,25 +1092,14 @@ static int max9286_v4l2_register(struct max9286_priv *priv) 
	if (ret)

		goto err_async;



	ep = fwnode_graph_get_endpoint_by_id(dev_fwnode(dev), MAX9286_SRC_PAD,

					     0, 0);

	if (!ep) {

		dev_err(dev, "Unable to retrieve endpoint on \"port@4\"\n");

		ret = -ENOENT;

		goto err_async;

	}

	priv->sd.fwnode = ep;



	ret = v4l2_async_register_subdev(&priv->sd);

	if (ret < 0) {

		dev_err(dev, "Unable to register subdevice\n");

		goto err_put_node;

		goto err_async;

	}



	return 0;



err_put_node:

	fwnode_handle_put(ep);

err_async:

	v4l2_ctrl_handler_free(&priv->ctrls);

	max9286_v4l2_notifier_unregister(priv);

drivers/media/i2c/rdacm20.c

+1 −15
Original line number Diff line number Diff line
@@ -567,7 +567,6 @@ static int rdacm20_initialize(struct rdacm20_device *dev) 
static int rdacm20_probe(struct i2c_client *client)

{

	struct rdacm20_device *dev;

	struct fwnode_handle *ep;

	int ret;



	dev = devm_kzalloc(&client->dev, sizeof(*dev), GFP_KERNEL);
@@ -616,24 +615,12 @@ static int rdacm20_probe(struct i2c_client *client) 
	if (ret < 0)

		goto error_free_ctrls;



	ep = fwnode_graph_get_next_endpoint(dev_fwnode(&client->dev), NULL);

	if (!ep) {

		dev_err(&client->dev,

			"Unable to get endpoint in node %pOF\n",

			client->dev.of_node);

		ret = -ENOENT;

		goto error_free_ctrls;

	}

	dev->sd.fwnode = ep;



	ret = v4l2_async_register_subdev(&dev->sd);

	if (ret)

		goto error_put_node;

		goto error_free_ctrls;



	return 0;



error_put_node:

	fwnode_handle_put(ep);

error_free_ctrls:

	v4l2_ctrl_handler_free(&dev->ctrls);

error:
@@ -650,7 +637,6 @@ static void rdacm20_remove(struct i2c_client *client) 
{

	struct rdacm20_device *dev = i2c_to_rdacm20(client);



	fwnode_handle_put(dev->sd.fwnode);

	v4l2_async_unregister_subdev(&dev->sd);

	v4l2_ctrl_handler_free(&dev->ctrls);

	media_entity_cleanup(&dev->sd.entity);

drivers/media/i2c/rdacm21.c

+1 −14
Original line number Diff line number Diff line
@@ -543,7 +543,6 @@ static int rdacm21_initialize(struct rdacm21_device *dev) 
static int rdacm21_probe(struct i2c_client *client)

{

	struct rdacm21_device *dev;

	struct fwnode_handle *ep;

	int ret;



	dev = devm_kzalloc(&client->dev, sizeof(*dev), GFP_KERNEL);
@@ -588,24 +587,12 @@ static int rdacm21_probe(struct i2c_client *client) 
	if (ret < 0)

		goto error_free_ctrls;



	ep = fwnode_graph_get_next_endpoint(dev_fwnode(&client->dev), NULL);

	if (!ep) {

		dev_err(&client->dev,

			"Unable to get endpoint in node %pOF\n",

			client->dev.of_node);

		ret = -ENOENT;

		goto error_free_ctrls;

	}

	dev->sd.fwnode = ep;



	ret = v4l2_async_register_subdev(&dev->sd);

	if (ret)

		goto error_put_node;

		goto error_free_ctrls;



	return 0;



error_put_node:

	fwnode_handle_put(dev->sd.fwnode);

error_free_ctrls:

	v4l2_ctrl_handler_free(&dev->ctrls);

error:

drivers/media/i2c/tc358746.c

+0 −5
Original line number Diff line number Diff line
@@ -1476,9 +1476,6 @@ static int tc358746_async_register(struct tc358746 *tc358746) 
	if (err)

		goto err_cleanup;



	tc358746->sd.fwnode = fwnode_graph_get_endpoint_by_id(

		dev_fwnode(tc358746->sd.dev), TC358746_SOURCE, 0, 0);



	err = v4l2_async_register_subdev(&tc358746->sd);

	if (err)

		goto err_unregister;
@@ -1486,7 +1483,6 @@ static int tc358746_async_register(struct tc358746 *tc358746) 
	return 0;



err_unregister:

	fwnode_handle_put(tc358746->sd.fwnode);

	v4l2_async_nf_unregister(&tc358746->notifier);

err_cleanup:

	v4l2_async_nf_cleanup(&tc358746->notifier);
@@ -1605,7 +1601,6 @@ static void tc358746_remove(struct i2c_client *client) 
	v4l2_fwnode_endpoint_free(&tc358746->csi_vep);

	v4l2_async_nf_unregister(&tc358746->notifier);

	v4l2_async_nf_cleanup(&tc358746->notifier);

	fwnode_handle_put(sd->fwnode);

	v4l2_async_unregister_subdev(sd);

	media_entity_cleanup(&sd->entity);