[media] v4l2-pci-skeleton.c: fill in device_caps in video_device
authorHans Verkuil <hans.verkuil@cisco.com>
Tue, 1 Mar 2016 14:57:24 +0000 (11:57 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Wed, 13 Apr 2016 19:41:31 +0000 (16:41 -0300)
With the new core support for the caps the driver no longer needs
to set device_caps and capabilities in the querycap call.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Documentation/video4linux/v4l2-pci-skeleton.c

index 79af0c0..a55cf94 100644 (file)
@@ -308,9 +308,6 @@ static int skeleton_querycap(struct file *file, void *priv,
        strlcpy(cap->card, "V4L2 PCI Skeleton", sizeof(cap->card));
        snprintf(cap->bus_info, sizeof(cap->bus_info), "PCI:%s",
                 pci_name(skel->pdev));
-       cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE |
-                          V4L2_CAP_STREAMING;
-       cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
        return 0;
 }
 
@@ -872,6 +869,8 @@ static int skeleton_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        vdev->release = video_device_release_empty;
        vdev->fops = &skel_fops,
        vdev->ioctl_ops = &skel_ioctl_ops,
+       vdev->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE |
+                           V4L2_CAP_STREAMING;
        /*
         * The main serialization lock. All ioctls are serialized by this
         * lock. Exception: if q->lock is set, then the streaming ioctls