From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Tue, 17 Feb 2015 08:44:04 +0000 (-0300)
Subject: [media] pvrusb2: replace .ioctl by .unlocked_ioctl
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ab91c61129a7ef5b584d68670dcf8ca93d3611e5;p=linux.git

[media] pvrusb2: replace .ioctl by .unlocked_ioctl

As far as I can tell pvrusb2 does its own locking, so there is
no need to use .ioctl.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
---

diff --git a/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c b/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c
index 35e4ea530494f..91c1700eb0708 100644
--- a/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c
+++ b/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c
@@ -1247,7 +1247,7 @@ static const struct v4l2_file_operations vdev_fops = {
 	.open       = pvr2_v4l2_open,
 	.release    = pvr2_v4l2_release,
 	.read       = pvr2_v4l2_read,
-	.ioctl      = pvr2_v4l2_ioctl,
+	.unlocked_ioctl = pvr2_v4l2_ioctl,
 	.poll       = pvr2_v4l2_poll,
 };