forked from luck/tmp_suning_uos_patched
v4l: Remove reference to bkl ioctl in compat ioctl handling
There are no more users of struct file_operations:ioctl. These can be safely removed. Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Mauro Carvalho Chehab <mchehab@redhat.com> Cc: John Kacur <jkacur@redhat.com> Cc: Hans Verkuil <hverkuil@xs4all.nl>
This commit is contained in:
parent
02d6d685fc
commit
c6d7ba8b12
|
@ -228,11 +228,6 @@ static long native_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
|
|||
|
||||
if (file->f_op->unlocked_ioctl)
|
||||
ret = file->f_op->unlocked_ioctl(file, cmd, arg);
|
||||
else if (file->f_op->ioctl) {
|
||||
lock_kernel();
|
||||
ret = file->f_op->ioctl(file->f_path.dentry->d_inode, file, cmd, arg);
|
||||
unlock_kernel();
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
@ -973,7 +968,7 @@ long v4l2_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg)
|
|||
{
|
||||
long ret = -ENOIOCTLCMD;
|
||||
|
||||
if (!file->f_op->ioctl && !file->f_op->unlocked_ioctl)
|
||||
if (!file->f_op->unlocked_ioctl)
|
||||
return ret;
|
||||
|
||||
switch (cmd) {
|
||||
|
|
Loading…
Reference in New Issue
Block a user