Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

authored by

Hans Verkuil and committed by
Mauro Carvalho Chehab
61df3c9b d2c998f7

+12 -12
+1 -1
drivers/media/video/arv.c
··· 712 712 static const struct v4l2_file_operations ar_fops = { 713 713 .owner = THIS_MODULE, 714 714 .read = ar_read, 715 - .ioctl = video_ioctl2, 715 + .unlocked_ioctl = video_ioctl2, 716 716 }; 717 717 718 718 static const struct v4l2_ioctl_ops ar_ioctl_ops = {
+1 -1
drivers/media/video/bw-qcam.c
··· 860 860 861 861 static const struct v4l2_file_operations qcam_fops = { 862 862 .owner = THIS_MODULE, 863 - .ioctl = video_ioctl2, 863 + .unlocked_ioctl = video_ioctl2, 864 864 .read = qcam_read, 865 865 }; 866 866
+1 -1
drivers/media/video/c-qcam.c
··· 718 718 719 719 static const struct v4l2_file_operations qcam_fops = { 720 720 .owner = THIS_MODULE, 721 - .ioctl = video_ioctl2, 721 + .unlocked_ioctl = video_ioctl2, 722 722 .read = qcam_read, 723 723 }; 724 724
+7 -7
drivers/media/video/meye.c
··· 1659 1659 .open = meye_open, 1660 1660 .release = meye_release, 1661 1661 .mmap = meye_mmap, 1662 - .ioctl = video_ioctl2, 1662 + .unlocked_ioctl = video_ioctl2, 1663 1663 .poll = meye_poll, 1664 1664 }; 1665 1665 ··· 1831 1831 msleep(1); 1832 1832 mchip_set(MCHIP_MM_INTA, MCHIP_MM_INTA_HIC_1_MASK); 1833 1833 1834 - if (video_register_device(meye.vdev, VFL_TYPE_GRABBER, 1835 - video_nr) < 0) { 1836 - v4l2_err(v4l2_dev, "video_register_device failed\n"); 1837 - goto outvideoreg; 1838 - } 1839 - 1840 1834 mutex_init(&meye.lock); 1841 1835 init_waitqueue_head(&meye.proc_list); 1842 1836 meye.brightness = 32 << 10; ··· 1851 1857 sony_pic_camera_command(SONY_PIC_COMMAND_SETCAMERASHARPNESS, 32); 1852 1858 sony_pic_camera_command(SONY_PIC_COMMAND_SETCAMERAPICTURE, 0); 1853 1859 sony_pic_camera_command(SONY_PIC_COMMAND_SETCAMERAAGC, 48); 1860 + 1861 + if (video_register_device(meye.vdev, VFL_TYPE_GRABBER, 1862 + video_nr) < 0) { 1863 + v4l2_err(v4l2_dev, "video_register_device failed\n"); 1864 + goto outvideoreg; 1865 + } 1854 1866 1855 1867 v4l2_info(v4l2_dev, "Motion Eye Camera Driver v%s.\n", 1856 1868 MEYE_DRIVER_VERSION);
+1 -1
drivers/media/video/pms.c
··· 932 932 933 933 static const struct v4l2_file_operations pms_fops = { 934 934 .owner = THIS_MODULE, 935 - .ioctl = video_ioctl2, 935 + .unlocked_ioctl = video_ioctl2, 936 936 .read = pms_read, 937 937 }; 938 938
+1 -1
drivers/media/video/w9966.c
··· 815 815 816 816 static const struct v4l2_file_operations w9966_fops = { 817 817 .owner = THIS_MODULE, 818 - .ioctl = video_ioctl2, 818 + .unlocked_ioctl = video_ioctl2, 819 819 .read = w9966_v4l_read, 820 820 }; 821 821