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>

2 files changed, 17 insertions, 19 deletions

diff --git a/drivers/media/pci/cx88/cx88-blackbird.c b/drivers/media/pci/cx88/cx88-blackbird.c
index 64dd8b6cf808..200d68827073 100644
--- a/drivers/media/pci/cx88/cx88-blackbird.c
+++ b/drivers/media/pci/cx88/cx88-blackbird.c
@@ -1136,6 +1136,10 @@ static int blackbird_register_video(struct cx8802_dev *dev)
         dev->mpeg_dev.ctrl_handler = &dev->cxhdl.hdl;
         video_set_drvdata(&dev->mpeg_dev, dev);
         dev->mpeg_dev.queue = &dev->vb2_mpegq;
+        dev->mpeg_dev.device_caps = V4L2_CAP_READWRITE | V4L2_CAP_STREAMING |
+                                    V4L2_CAP_VIDEO_CAPTURE;
+        if (dev->core->board.tuner_type != UNSET)
+                dev->mpeg_dev.device_caps |= V4L2_CAP_TUNER;
         err = video_register_device(&dev->mpeg_dev, VFL_TYPE_GRABBER, -1);
         if (err < 0) {
                 pr_info("can't register mpeg device\n");
diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
index 5256ad7ead38..e59a74514c7c 100644
--- a/drivers/media/pci/cx88/cx88-video.c
+++ b/drivers/media/pci/cx88/cx88-video.c
@@ -800,27 +800,12 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
 int cx88_querycap(struct file *file, struct cx88_core *core,
                   struct v4l2_capability *cap)
 {
-        struct video_device *vdev = video_devdata(file);
-
         strscpy(cap->card, core->board.name, sizeof(cap->card));
-        cap->device_caps = V4L2_CAP_READWRITE | V4L2_CAP_STREAMING;
+        cap->capabilities = V4L2_CAP_READWRITE | V4L2_CAP_STREAMING |
+                            V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VBI_CAPTURE |
+                            V4L2_CAP_DEVICE_CAPS;
         if (core->board.tuner_type != UNSET)
-                cap->device_caps |= V4L2_CAP_TUNER;
-        switch (vdev->vfl_type) {
-        case VFL_TYPE_RADIO:
-                cap->device_caps = V4L2_CAP_RADIO | V4L2_CAP_TUNER;
-                break;
-        case VFL_TYPE_GRABBER:
-                cap->device_caps |= V4L2_CAP_VIDEO_CAPTURE;
-                break;
-        case VFL_TYPE_VBI:
-                cap->device_caps |= V4L2_CAP_VBI_CAPTURE;
-                break;
-        default:
-                return -EINVAL;
-        }
-        cap->capabilities = cap->device_caps | V4L2_CAP_VIDEO_CAPTURE |
-                V4L2_CAP_VBI_CAPTURE | V4L2_CAP_DEVICE_CAPS;
+                cap->capabilities |= V4L2_CAP_TUNER;
         if (core->board.radio.type == CX88_RADIO)
                 cap->capabilities |= V4L2_CAP_RADIO;
         return 0;
@@ -1473,6 +1458,10 @@ static int cx8800_initdev(struct pci_dev *pci_dev,
         video_set_drvdata(&dev->video_dev, dev);
         dev->video_dev.ctrl_handler = &core->video_hdl;
         dev->video_dev.queue = &dev->vb2_vidq;
+        dev->video_dev.device_caps = V4L2_CAP_READWRITE | V4L2_CAP_STREAMING |
+                                     V4L2_CAP_VIDEO_CAPTURE;
+        if (core->board.tuner_type != UNSET)
+                dev->video_dev.device_caps |= V4L2_CAP_TUNER;
         err = video_register_device(&dev->video_dev, VFL_TYPE_GRABBER,
                                     video_nr[core->nr]);
         if (err < 0) {
@@ -1486,6 +1475,10 @@ static int cx8800_initdev(struct pci_dev *pci_dev,
                        &cx8800_vbi_template, "vbi");
         video_set_drvdata(&dev->vbi_dev, dev);
         dev->vbi_dev.queue = &dev->vb2_vbiq;
+        dev->vbi_dev.device_caps = V4L2_CAP_READWRITE | V4L2_CAP_STREAMING |
+                                   V4L2_CAP_VBI_CAPTURE;
+        if (core->board.tuner_type != UNSET)
+                dev->vbi_dev.device_caps |= V4L2_CAP_TUNER;
         err = video_register_device(&dev->vbi_dev, VFL_TYPE_VBI,
                                     vbi_nr[core->nr]);
         if (err < 0) {
@@ -1500,6 +1493,7 @@ static int cx8800_initdev(struct pci_dev *pci_dev,
                                &cx8800_radio_template, "radio");
                 video_set_drvdata(&dev->radio_dev, dev);
                 dev->radio_dev.ctrl_handler = &core->audio_hdl;
+                dev->radio_dev.device_caps = V4L2_CAP_RADIO | V4L2_CAP_TUNER;
                 err = video_register_device(&dev->radio_dev, VFL_TYPE_RADIO,
                                             radio_nr[core->nr]);
                 if (err < 0) {