Skip to content

Commit

Permalink
v4l: Remove reference to bkl ioctl in compat ioctl handling
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Frederic Weisbecker committed Aug 13, 2010
1 parent 02d6d68 commit c6d7ba8
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions drivers/media/video/v4l2-compat-ioctl32.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit c6d7ba8

Please sign in to comment.