From c6d7ba8b12636923f3e30997dec69bed58e176b6 Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker Date: Fri, 13 Aug 2010 22:29:03 +0200 Subject: [PATCH] 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 Cc: Arnd Bergmann Cc: Mauro Carvalho Chehab Cc: John Kacur Cc: Hans Verkuil --- drivers/media/video/v4l2-compat-ioctl32.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/media/video/v4l2-compat-ioctl32.c b/drivers/media/video/v4l2-compat-ioctl32.c index d2f20c2acae..073f01390cd 100644 --- a/drivers/media/video/v4l2-compat-ioctl32.c +++ b/drivers/media/video/v4l2-compat-ioctl32.c @@ -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) { -- 2.20.1