diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2011-02-03 13:42:39 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-04 12:44:31 -0800 |
| commit | f2b3c685b9b1c048cfa8bef98dac037275b9d20d (patch) | |
| tree | 16f587830a4dc3efc3bbcedd9e980ffb1cb3401f /drivers/staging/easycap/easycap_ioctl.c | |
| parent | 9306b1bb8b6de05786c8aa79a19988aa15453968 (diff) | |
staging/easycap: kill EASYCAP_NEEDS_UNLOCKED_IOCTL
we can kill this option for in-kernel driver
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/easycap/easycap_ioctl.c')
| -rw-r--r-- | drivers/staging/easycap/easycap_ioctl.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/staging/easycap/easycap_ioctl.c b/drivers/staging/easycap/easycap_ioctl.c index 9671ff193acd..ee581c4f8037 100644 --- a/drivers/staging/easycap/easycap_ioctl.c +++ b/drivers/staging/easycap/easycap_ioctl.c @@ -949,20 +949,9 @@ while (0xFFFFFFFF != easycap_control[i1].id) { SAM("WARNING: failed to adjust mute: control not found\n"); return -ENOENT; } -/*****************************************************************************/ -/*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/ -#if ((defined(EASYCAP_IS_VIDEODEV_CLIENT)) || \ - (defined(EASYCAP_NEEDS_UNLOCKED_IOCTL))) -long -easycap_ioctl_noinode(struct file *file, unsigned int cmd, unsigned long arg) { - return (long)easycap_ioctl(NULL, file, cmd, arg); -} -#endif /*EASYCAP_IS_VIDEODEV_CLIENT||EASYCAP_NEEDS_UNLOCKED_IOCTL*/ -/*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ /*---------------------------------------------------------------------------*/ -int -easycap_ioctl(struct inode *inode, struct file *file, - unsigned int cmd, unsigned long arg) +long easycap_unlocked_ioctl(struct file *file, + unsigned int cmd, unsigned long arg) { struct easycap *peasycap; struct usb_device *p; |