media: sh_veu/sh_vou: set device_caps in struct video_device

Instead of filling in the struct v4l2_capability device_caps
field, fill in the struct video_device device_caps field.

That way the V4L2 core knows what the capabilities of the
video device are.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Reviewed-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/platform/sh_veu.c b/drivers/media/platform/sh_veu.c
index 26360af..4be6efd 100644 (file)
--- a/drivers/media/platform/sh_veu.c
+++ b/drivers/media/platform/sh_veu.c
@@ -347,9 +347,6 @@ static int sh_veu_querycap(struct file *file, void *priv,
        strscpy(cap->driver, "sh-veu", sizeof(cap->driver));
        strscpy(cap->card, "sh-mobile VEU", sizeof(cap->card));
        strscpy(cap->bus_info, "platform:sh-veu", sizeof(cap->bus_info));
-       cap->device_caps = V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING;
-       cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
-
        return 0;
 }
 
@@ -1036,6 +1033,7 @@ static const struct video_device sh_veu_videodev = {
        .minor          = -1,
        .release        = video_device_release_empty,
        .vfl_dir        = VFL_DIR_M2M,
+       .device_caps    = V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING,
 };
 
 static const struct v4l2_m2m_ops sh_veu_m2m_ops = {

diff --git a/drivers/media/platform/sh_vou.c b/drivers/media/platform/sh_vou.c
index 4fc1b4e..2236702 100644 (file)
--- a/drivers/media/platform/sh_vou.c
+++ b/drivers/media/platform/sh_vou.c
@@ -375,9 +375,6 @@ static int sh_vou_querycap(struct file *file, void  *priv,
        strscpy(cap->card, "SuperH VOU", sizeof(cap->card));
        strscpy(cap->driver, "sh-vou", sizeof(cap->driver));
        strscpy(cap->bus_info, "platform:sh-vou", sizeof(cap->bus_info));
-       cap->device_caps = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_READWRITE |
-                          V4L2_CAP_STREAMING;
-       cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
        return 0;
 }
 
@@ -1210,6 +1207,8 @@ static const struct video_device sh_vou_video_template = {
        .ioctl_ops      = &sh_vou_ioctl_ops,
        .tvnorms        = V4L2_STD_525_60, /* PAL only supported in 8-bit non-bt656 mode */
        .vfl_dir        = VFL_DIR_TX,
+       .device_caps    = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_READWRITE |
+                         V4L2_CAP_STREAMING,
 };
 
 static int sh_vou_probe(struct platform_device *pdev)