staging: Pushdown bkl to easycap ioctl handlers
PATCH 1/1 staging: Pushdown bkl to easycap ioctl handlers
These were amongst the last users of struct file_operations:ioctl
(applied in my bkl/ioctl branch)
Signed-off-by Frederic Weisbecker <[email protected]>
Cc Arnd Bergmann <[email protected]>
Cc John Kacur <[email protected]>
Cc Greg KH <[email protected]>
--- drivers/staging/easycap/easycap.h | 8 +--- drivers/staging/easycap/easycap_ioctl.c | 52 ++++++++++++++++++------------- drivers/staging/easycap/easycap_main.c | 38 +++++++++++----------- 3 files changed, 51 insertions(+), 47 deletions(-)
drivers/staging/easycap/easycap.h +2 -6
@@ -463,15 +463,12 @@ struct data_buffer audio_buffer[];void easycap_complete (struct urb *);int easycap_open (struct inode *,struct file *);int easycap_release (struct inode *,struct file *); -int easycap_ioctl (struct inode *,struct file *, \ -unsigned int ,unsigned long ); +long easycap_ioctl (struct file *,unsigned int ,unsigned long );/*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/ #if defined(EASYCAP_IS_VIDEODEV_CLIENT )int easycap_open_noinode (struct file *);int easycap_release_noinode (struct file *); -long easycap_ioctl_noinode (struct file *, \ -unsigned int ,unsigned long );int videodev_release (struct video_device *);#endif /*EASYCAP_IS_VIDEODEV_CLIENT*/ /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
@@ -515,8 +512,7 @@ void easysnd_complete(struct urb *);ssize_t easysnd_read (struct file *,char __user *,size_t ,loff_t *);int easysnd_open (struct inode *,struct file *);int easysnd_release (struct inode *,struct file *); -int easysnd_ioctl (struct inode *,struct file *, \ -unsigned int ,unsigned long ); +long easysnd_ioctl (struct file *,unsigned int ,unsigned long );unsigned int easysnd_poll (struct file *,poll_table *);void easysnd_delete (struct kref *);int submit_audio_urbs (struct easycap *);
drivers/staging/easycap/easycap_ioctl.c +30 -22
80 lines not on this page · raw message
drivers/staging/easycap/easycap_main.c +19 -19
@@ -60,13 +60,13 @@ struct usb_driver easycap_usb_driver = {*/ /*---------------------------------------------------------------------------*/ const struct file_operations easycap_fops = { -.owner =THIS_MODULE , -.open = easycap_open, -.release = easycap_release, -.ioctl = easycap_ioctl, -.poll = easycap_poll, -.mmap = easycap_mmap, -.llseek = no_llseek, + .owner =THIS_MODULE , + .open = easycap_open, + .release = easycap_release, + .unlocked_ioctl = easycap_ioctl, + .poll = easycap_poll, + .mmap = easycap_mmap, + .llseek = no_llseek, };struct vm_operations_struct easycap_vm_ops = { .open = easycap_vma_open,
@@ -83,12 +83,12 @@ struct usb_class_driver easycap_class = {#if defined(EASYCAP_IS_VIDEODEV_CLIENT )#if defined(EASYCAP_NEEDS_V4L2_FOPS )const struct v4l2_file_operations v4l2_fops = { -.owner =THIS_MODULE , -.open = easycap_open_noinode, -.release = easycap_release_noinode, -.ioctl = easycap_ioctl_noinode, -.poll = easycap_poll, -.mmap = easycap_mmap, + .owner =THIS_MODULE , + .open = easycap_open_noinode, + .release = easycap_release_noinode, + .unlocked_ioctl = easycap_ioctl, + .poll = easycap_poll, + .mmap = easycap_mmap, };#endif /*EASYCAP_NEEDS_V4L2_FOPS*/ int video_device_many/*=0*/ ;
@@ -102,12 +102,12 @@ struct video_device *pvideo_array[VIDEO_DEVICE_MANY], *pvideo_device;*/ /*--------------------------------------------------------------------------*/ const struct file_operations easysnd_fops = { -.owner =THIS_MODULE , -.open = easysnd_open, -.release = easysnd_release, -.ioctl = easysnd_ioctl, -.read = easysnd_read, -.llseek = no_llseek, + .owner =THIS_MODULE , + .open = easysnd_open, + .release = easysnd_release, + .unlocked_ioctl = easysnd_ioctl, + .read = easysnd_read, + .llseek = no_llseek, };struct usb_class_driver easysnd_class = { .name ="usb/easysnd%d" ,
Signature · 1 line
1.6.2.3