diff options
| author | Frederic Weisbecker <fweisbec@gmail.com> | 2010-08-09 03:28:40 +0200 |
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2010-08-09 03:28:40 +0200 |
| commit | 5ef06839f50c7e5e479d3595257131edf1f84f36 (patch) | |
| tree | 1fa856be5f0e728ba9decfc405f1ea4477d3967a /drivers/staging/easycap/easycap.h | |
| parent | d9a145fb6e5f37b9903dea8371ab5c3e34e8e2d1 (diff) | |
staging: Pushdown bkl to easycap ioctl handlers
These were amongst the last users of struct file_operations:ioctl
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Diffstat (limited to 'drivers/staging/easycap/easycap.h')
| -rw-r--r-- | drivers/staging/easycap/easycap.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/staging/easycap/easycap.h b/drivers/staging/easycap/easycap.h index ad836d2d26fe..f3c827eb0abe 100644 --- a/drivers/staging/easycap/easycap.h +++ b/drivers/staging/easycap/easycap.h @@ -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 *); |