OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[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: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
[hans.verkuil@cisco.com: fix typo: surce -> source]
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Niklas Söderlund 2017-05-23 21:15:37 -03:00 committed by Mauro Carvalho Chehab
parent bd8448f732
commit f8a668f72e
1 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/media/platform/rcar-vin/rcar-core.c
View File

@ -101,14 +101,9 @@ static void rvin_digital_notify_unbind(struct v4l2_async_notifier *notifier,
{
struct rvin_dev *vin = notifier_to_vin(notifier);
if (vin->digital.subdev == subdev) {
vin_dbg(vin, "unbind digital subdev %s\n", subdev->name);
rvin_v4l2_remove(vin);
vin->digital.subdev = NULL;
return;
}
vin_err(vin, "no entity for subdev %s to unbind\n", subdev->name);
vin_dbg(vin, "unbind digital subdev %s\n", subdev->name);
rvin_v4l2_remove(vin);
vin->digital.subdev = NULL;
}
static int rvin_digital_notify_bound(struct v4l2_async_notifier *notifier,
@ -120,28 +115,23 @@ static int rvin_digital_notify_bound(struct v4l2_async_notifier *notifier,
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);
if (ret < 0)
return ret;
vin->digital.source_pad = ret;
ret = rvin_find_pad(subdev, MEDIA_PAD_FL_SOURCE);
if (ret < 0)
return ret;
vin->digital.source_pad = ret;
ret = rvin_find_pad(subdev, MEDIA_PAD_FL_SINK);
vin->digital.sink_pad = ret < 0 ? 0 : ret;
ret = rvin_find_pad(subdev, MEDIA_PAD_FL_SINK);
vin->digital.sink_pad = ret < 0 ? 0 : ret;
vin->digital.subdev = subdev;
vin->digital.subdev = subdev;
vin_dbg(vin, "bound subdev %s source pad: %u sink pad: %u\n",
subdev->name, vin->digital.source_pad,
vin->digital.sink_pad);
return 0;
}
vin_dbg(vin, "bound subdev %s source pad: %u sink pad: %u\n",
subdev->name, vin->digital.source_pad,
vin->digital.sink_pad);
vin_err(vin, "no entity for subdev %s to bind\n", subdev->name);
return -EINVAL;
return 0;
}
static int rvin_digitial_parse_v4l2(struct rvin_dev *vin,