diff options
| author | Niklas Söderlund | 2017-05-24 02:15:37 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2017-06-06 21:44:00 +0200 |
| commit | f8a668f72e79a2ee7c1aef7d36d3b59f9d4cf9a5 (patch) | |
| tree | 01b0e3c6328245964b9650563e16f8c2de71f8da /drivers/media/platform/rcar-vin/rcar-core.c | |
| parent | [media] rcar-vin: refactor and fold in function after stall handling rework (diff) | |
| download | kernel-qcow2-linux-f8a668f72e79a2ee7c1aef7d36d3b59f9d4cf9a5.tar.gz kernel-qcow2-linux-f8a668f72e79a2ee7c1aef7d36d3b59f9d4cf9a5.tar.xz kernel-qcow2-linux-f8a668f72e79a2ee7c1aef7d36d3b59f9d4cf9a5.zip | |
[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>
Diffstat (limited to 'drivers/media/platform/rcar-vin/rcar-core.c')
| -rw-r--r-- | drivers/media/platform/rcar-vin/rcar-core.c | 40 |
1 files changed, 15 insertions, 25 deletions
diff --git a/drivers/media/platform/rcar-vin/rcar-core.c b/drivers/media/platform/rcar-vin/rcar-core.c index 94c5c8d905d9..77dff047c41c 100644 --- a/drivers/media/platform/rcar-vin/rcar-core.c +++ b/drivers/media/platform/rcar-vin/rcar-core.c @@ -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, |