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

Commit f8a668f7 authored by Niklas Söderlund's avatar Niklas Söderlund Committed by Mauro Carvalho Chehab
Browse files

[media] rcar-vin: remove subdevice matching from bind and unbind callbacks 



There is only one subdevice registered with the async framework so there
is no need for the driver to check which subdevice is bound or unbound.
Remove these checks since the async framework preforms this.

Signed-off-by: default avatarNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
[hans.verkuil@cisco.com: fix typo: surce -> source]
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent bd8448f7

drivers/media/platform/rcar-vin/rcar-core.c

+15 −25
Original line number Original line Diff line number Diff line
@@ -101,14 +101,9 @@ static void rvin_digital_notify_unbind(struct v4l2_async_notifier *notifier, 
{

{

	struct rvin_dev *vin = notifier_to_vin(notifier);

	struct rvin_dev *vin = notifier_to_vin(notifier);





	if (vin->digital.subdev == subdev) {

	vin_dbg(vin, "unbind digital subdev %s\n", subdev->name);

	vin_dbg(vin, "unbind digital subdev %s\n", subdev->name);

	rvin_v4l2_remove(vin);

	rvin_v4l2_remove(vin);

	vin->digital.subdev = NULL;

	vin->digital.subdev = NULL;

		return;

	}



	vin_err(vin, "no entity for subdev %s to unbind\n", subdev->name);

}

}





static int rvin_digital_notify_bound(struct v4l2_async_notifier *notifier,

static int rvin_digital_notify_bound(struct v4l2_async_notifier *notifier,
@@ -120,8 +115,6 @@ static int rvin_digital_notify_bound(struct v4l2_async_notifier *notifier, 




	v4l2_set_subdev_hostdata(subdev, vin);

	v4l2_set_subdev_hostdata(subdev, vin);





	if (vin->digital.asd.match.fwnode.fwnode ==

	    of_fwnode_handle(subdev->dev->of_node)) {

	/* Find source and sink pad of remote subdevice */

	/* Find source and sink pad of remote subdevice */





	ret = rvin_find_pad(subdev, MEDIA_PAD_FL_SOURCE);

	ret = rvin_find_pad(subdev, MEDIA_PAD_FL_SOURCE);
@@ -137,11 +130,8 @@ static int rvin_digital_notify_bound(struct v4l2_async_notifier *notifier, 
	vin_dbg(vin, "bound subdev %s source pad: %u sink pad: %u\n",

	vin_dbg(vin, "bound subdev %s source pad: %u sink pad: %u\n",

		subdev->name, vin->digital.source_pad,

		subdev->name, vin->digital.source_pad,

		vin->digital.sink_pad);

		vin->digital.sink_pad);

		return 0;

	}





	vin_err(vin, "no entity for subdev %s to bind\n", subdev->name);

	return 0;

	return -EINVAL;

}

}





static int rvin_digitial_parse_v4l2(struct rvin_dev *vin,

static int rvin_digitial_parse_v4l2(struct rvin_dev *vin,