media: media/pci: 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.

But this only really works if all drivers use this, so convert
all pci drivers in this patch.

Tested with cx88-blackbird and ivtv PVR-350.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

1 files changed, 2 insertions, 6 deletions

diff --git a/drivers/media/pci/tw68/tw68-video.c b/drivers/media/pci/tw68/tw68-video.c
index 5b469cf578f5..8e0952d65ad4 100644
--- a/drivers/media/pci/tw68/tw68-video.c
+++ b/drivers/media/pci/tw68/tw68-video.c
@@ -729,12 +729,6 @@ static int tw68_querycap(struct file *file, void  *priv,
         strscpy(cap->card, "Techwell Capture Card",
                 sizeof(cap->card));
         sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci));
-        cap->device_caps =
-                V4L2_CAP_VIDEO_CAPTURE |
-                V4L2_CAP_READWRITE |
-                V4L2_CAP_STREAMING;
-
-        cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
         return 0;
 }
 
@@ -913,6 +907,8 @@ static const struct video_device tw68_video_template = {
         .ioctl_ops              = &video_ioctl_ops,
         .release                = video_device_release_empty,
         .tvnorms                = TW68_NORMS,
+        .device_caps            = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE |
+                                  V4L2_CAP_STREAMING,
 };
 
 /* ------------------------------------------------------------------ */