Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61df3c9b authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] BKL: trivial ioctl -> unlocked_ioctl video driver conversions 



These drivers could be trivially converted to unlocked_ioctl since they
already did locking.

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent d2c998f7

drivers/media/video/arv.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -712,7 +712,7 @@ static int ar_initialize(struct ar *ar) 
static const struct v4l2_file_operations ar_fops = {

static const struct v4l2_file_operations ar_fops = {

	.owner		= THIS_MODULE,

	.owner		= THIS_MODULE,

	.read		= ar_read,

	.read		= ar_read,

	.ioctl		= video_ioctl2,

	.unlocked_ioctl	= video_ioctl2,

};

};





static const struct v4l2_ioctl_ops ar_ioctl_ops = {

static const struct v4l2_ioctl_ops ar_ioctl_ops = {

drivers/media/video/bw-qcam.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -860,7 +860,7 @@ static ssize_t qcam_read(struct file *file, char __user *buf, 




static const struct v4l2_file_operations qcam_fops = {

static const struct v4l2_file_operations qcam_fops = {

	.owner		= THIS_MODULE,

	.owner		= THIS_MODULE,

	.ioctl          = video_ioctl2,

	.unlocked_ioctl = video_ioctl2,

	.read		= qcam_read,

	.read		= qcam_read,

};

};

drivers/media/video/c-qcam.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -718,7 +718,7 @@ static ssize_t qcam_read(struct file *file, char __user *buf, 




static const struct v4l2_file_operations qcam_fops = {

static const struct v4l2_file_operations qcam_fops = {

	.owner		= THIS_MODULE,

	.owner		= THIS_MODULE,

	.ioctl		= video_ioctl2,

	.unlocked_ioctl	= video_ioctl2,

	.read		= qcam_read,

	.read		= qcam_read,

};

};

drivers/media/video/meye.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -1659,7 +1659,7 @@ static const struct v4l2_file_operations meye_fops = { 
	.open		= meye_open,

	.open		= meye_open,

	.release	= meye_release,

	.release	= meye_release,

	.mmap		= meye_mmap,

	.mmap		= meye_mmap,

	.ioctl		= video_ioctl2,

	.unlocked_ioctl	= video_ioctl2,

	.poll		= meye_poll,

	.poll		= meye_poll,

};

};
@@ -1831,12 +1831,6 @@ static int __devinit meye_probe(struct pci_dev *pcidev, 
	msleep(1);

	msleep(1);

	mchip_set(MCHIP_MM_INTA, MCHIP_MM_INTA_HIC_1_MASK);

	mchip_set(MCHIP_MM_INTA, MCHIP_MM_INTA_HIC_1_MASK);





	if (video_register_device(meye.vdev, VFL_TYPE_GRABBER,

				  video_nr) < 0) {

		v4l2_err(v4l2_dev, "video_register_device failed\n");

		goto outvideoreg;

	}



	mutex_init(&meye.lock);

	mutex_init(&meye.lock);

	init_waitqueue_head(&meye.proc_list);

	init_waitqueue_head(&meye.proc_list);

	meye.brightness = 32 << 10;

	meye.brightness = 32 << 10;
@@ -1858,6 +1852,12 @@ static int __devinit meye_probe(struct pci_dev *pcidev, 
	sony_pic_camera_command(SONY_PIC_COMMAND_SETCAMERAPICTURE, 0);

	sony_pic_camera_command(SONY_PIC_COMMAND_SETCAMERAPICTURE, 0);

	sony_pic_camera_command(SONY_PIC_COMMAND_SETCAMERAAGC, 48);

	sony_pic_camera_command(SONY_PIC_COMMAND_SETCAMERAAGC, 48);





	if (video_register_device(meye.vdev, VFL_TYPE_GRABBER,

				  video_nr) < 0) {

		v4l2_err(v4l2_dev, "video_register_device failed\n");

		goto outvideoreg;

	}



	v4l2_info(v4l2_dev, "Motion Eye Camera Driver v%s.\n",

	v4l2_info(v4l2_dev, "Motion Eye Camera Driver v%s.\n",

	       MEYE_DRIVER_VERSION);

	       MEYE_DRIVER_VERSION);

	v4l2_info(v4l2_dev, "mchip KL5A72002 rev. %d, base %lx, irq %d\n",

	v4l2_info(v4l2_dev, "mchip KL5A72002 rev. %d, base %lx, irq %d\n",

drivers/media/video/pms.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -932,7 +932,7 @@ static ssize_t pms_read(struct file *file, char __user *buf, 




static const struct v4l2_file_operations pms_fops = {

static const struct v4l2_file_operations pms_fops = {

	.owner		= THIS_MODULE,

	.owner		= THIS_MODULE,

	.ioctl		= video_ioctl2,

	.unlocked_ioctl	= video_ioctl2,

	.read           = pms_read,

	.read           = pms_read,

};

};