diff mbox

[2/5] v4l2-pci-skeleton.c: fill in device_caps in video_device

Message ID 1456746345-1431-3-git-send-email-hverkuil@xs4all.nl (mailing list archive)
State New, archived
Headers show

Commit Message

Hans Verkuil Feb. 29, 2016, 11:45 a.m. UTC 
From: Hans Verkuil <hans.verkuil@cisco.com>

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>
---
 Documentation/video4linux/v4l2-pci-skeleton.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Laurent Pinchart Feb. 29, 2016, 11:57 a.m. UTC | #1 
Hi Hans,

Thank you for the patch.

On Monday 29 February 2016 12:45:42 Hans Verkuil wrote:
> From: Hans Verkuil <hans.verkuil@cisco.com>
> 
> 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>
> ---
>  Documentation/video4linux/v4l2-pci-skeleton.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/Documentation/video4linux/v4l2-pci-skeleton.c
> b/Documentation/video4linux/v4l2-pci-skeleton.c index 79af0c0..65fae1a
> 100644
> --- a/Documentation/video4linux/v4l2-pci-skeleton.c
> +++ b/Documentation/video4linux/v4l2-pci-skeleton.c
> @@ -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,9 @@ 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,
> +	/* Fill in the device caps */

The comment seems a bit overkill to me, the next line is pretty clear. Apart 
from that,

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> +	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
diff mbox

Patch

diff --git a/Documentation/video4linux/v4l2-pci-skeleton.c b/Documentation/video4linux/v4l2-pci-skeleton.c
index 79af0c0..65fae1a 100644
--- a/Documentation/video4linux/v4l2-pci-skeleton.c
+++ b/Documentation/video4linux/v4l2-pci-skeleton.c
@@ -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,9 @@  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,
+	/* Fill in the device caps */
+	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