Hi Niklas,
Thank you for the patch.
On Fri, Mar 06, 2020 at 05:39:34PM +0100, Niklas Söderlund wrote:
> From: Niklas Söderlund <niklas.soderlund+renesas@xxxxxxxxxxxx>
>
> Set the V4L2_CAP_IO_MC capability flag and remove the driver specific
> vidioc_enum_input, vidioc_g_input and vidioc_s_input callbacks for the
> media controller enabled part of the driver.
>
> Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@xxxxxxxxxxxx>
Reviewed-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> ---
> drivers/media/platform/rcar-vin/rcar-v4l2.c | 17 +----------------
> 1 file changed, 1 insertion(+), 16 deletions(-)
>
> diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c
> index 5151a3cd8a6e6754..96ddd36619167fd5 100644
> --- a/drivers/media/platform/rcar-vin/rcar-v4l2.c
> +++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c
> @@ -767,18 +767,6 @@ static int rvin_mc_s_fmt_vid_cap(struct file *file, void *priv,
> return 0;
> }
>
> -static int rvin_mc_enum_input(struct file *file, void *priv,
> - struct v4l2_input *i)
> -{
> - if (i->index != 0)
> - return -EINVAL;
> -
> - i->type = V4L2_INPUT_TYPE_CAMERA;
> - strscpy(i->name, "Camera", sizeof(i->name));
> -
> - return 0;
> -}
> -
> static const struct v4l2_ioctl_ops rvin_mc_ioctl_ops = {
> .vidioc_querycap = rvin_querycap,
> .vidioc_try_fmt_vid_cap = rvin_mc_try_fmt_vid_cap,
> @@ -786,10 +774,6 @@ static const struct v4l2_ioctl_ops rvin_mc_ioctl_ops = {
> .vidioc_s_fmt_vid_cap = rvin_mc_s_fmt_vid_cap,
> .vidioc_enum_fmt_vid_cap = rvin_enum_fmt_vid_cap,
>
> - .vidioc_enum_input = rvin_mc_enum_input,
> - .vidioc_g_input = rvin_g_input,
> - .vidioc_s_input = rvin_s_input,
> -
> .vidioc_reqbufs = vb2_ioctl_reqbufs,
> .vidioc_create_bufs = vb2_ioctl_create_bufs,
> .vidioc_querybuf = vb2_ioctl_querybuf,
> @@ -961,6 +945,7 @@ int rvin_v4l2_register(struct rvin_dev *vin)
> vin->format.colorspace = RVIN_DEFAULT_COLORSPACE;
>
> if (vin->info->use_mc) {
> + vdev->device_caps |= V4L2_CAP_IO_MC;
> vdev->ioctl_ops = &rvin_mc_ioctl_ops;
> } else {
> vdev->ioctl_ops = &rvin_ioctl_ops;
--
Regards,
Laurent Pinchart
