From 152a3a7320d1582009db85d8be365ce430d079af Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Mon, 14 May 2012 11:32:48 -0300 Subject: [media] v4l2-dev: rename two functions Rename the function v4l2_dont_use_lock to v4l2_disable_ioctl_locking, and rename v4l2_dont_use_cmd to v4l2_disable_ioctl. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- drivers/media/video/pwc/pwc-if.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/media/video/pwc/pwc-if.c') diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c index 998e809765a..ec4e2ef54e6 100644 --- a/drivers/media/video/pwc/pwc-if.c +++ b/drivers/media/video/pwc/pwc-if.c @@ -1195,9 +1195,9 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id * v4l2_lock is taken for a long time, e.g. when changing a control * value, and a new frame is ready to be dequeued. */ - v4l2_dont_use_lock(&pdev->vdev, VIDIOC_DQBUF); - v4l2_dont_use_lock(&pdev->vdev, VIDIOC_QBUF); - v4l2_dont_use_lock(&pdev->vdev, VIDIOC_QUERYBUF); + v4l2_disable_ioctl_locking(&pdev->vdev, VIDIOC_DQBUF); + v4l2_disable_ioctl_locking(&pdev->vdev, VIDIOC_QBUF); + v4l2_disable_ioctl_locking(&pdev->vdev, VIDIOC_QUERYBUF); rc = video_register_device(&pdev->vdev, VFL_TYPE_GRABBER, -1); if (rc < 0) { -- cgit v1.2.3-70-g09d2