These drivers could be trivially converted to unlocked_ioctl since they
already did locking.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
static const struct v4l2_file_operations ar_fops = {
.owner = THIS_MODULE,
.read = ar_read,
static const struct v4l2_file_operations ar_fops = {
.owner = THIS_MODULE,
.read = ar_read,
+ .unlocked_ioctl = video_ioctl2,
};
static const struct v4l2_ioctl_ops ar_ioctl_ops = {
};
static const struct v4l2_ioctl_ops ar_ioctl_ops = {
static const struct v4l2_file_operations qcam_fops = {
.owner = THIS_MODULE,
static const struct v4l2_file_operations qcam_fops = {
.owner = THIS_MODULE,
+ .unlocked_ioctl = video_ioctl2,
static const struct v4l2_file_operations qcam_fops = {
.owner = THIS_MODULE,
static const struct v4l2_file_operations qcam_fops = {
.owner = THIS_MODULE,
+ .unlocked_ioctl = video_ioctl2,
.open = meye_open,
.release = meye_release,
.mmap = meye_mmap,
.open = meye_open,
.release = meye_release,
.mmap = meye_mmap,
+ .unlocked_ioctl = video_ioctl2,
msleep(1);
mchip_set(MCHIP_MM_INTA, MCHIP_MM_INTA_HIC_1_MASK);
msleep(1);
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);
init_waitqueue_head(&meye.proc_list);
meye.brightness = 32 << 10;
mutex_init(&meye.lock);
init_waitqueue_head(&meye.proc_list);
meye.brightness = 32 << 10;
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_SETCAMERAPICTURE, 0);
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",
MEYE_DRIVER_VERSION);
v4l2_info(v4l2_dev, "mchip KL5A72002 rev. %d, base %lx, irq %d\n",
v4l2_info(v4l2_dev, "Motion Eye Camera Driver v%s.\n",
MEYE_DRIVER_VERSION);
v4l2_info(v4l2_dev, "mchip KL5A72002 rev. %d, base %lx, irq %d\n",
static const struct v4l2_file_operations pms_fops = {
.owner = THIS_MODULE,
static const struct v4l2_file_operations pms_fops = {
.owner = THIS_MODULE,
+ .unlocked_ioctl = video_ioctl2,
static const struct v4l2_file_operations w9966_fops = {
.owner = THIS_MODULE,
static const struct v4l2_file_operations w9966_fops = {
.owner = THIS_MODULE,
+ .unlocked_ioctl = video_ioctl2,
.read = w9966_v4l_read,
};
.read = w9966_v4l_read,
};