Prev: Your Webmail Update Alert
Next: [PATCH 2/2] bkl: Remove locked .ioctl file operation
From: Frederic Weisbecker on 13 Aug 2010 20:40
There are no more users of struct file_operations:ioctl. These
can be safely removed.

Signed-off-by: Frederic Weisbecker <fweisbec(a)gmail.com>
Cc: Arnd Bergmann <arnd(a)arndb.de>
Cc: Mauro Carvalho Chehab <mchehab(a)redhat.com>
Cc: John Kacur <jkacur(a)redhat.com>
Cc: Hans Verkuil <hverkuil(a)xs4all.nl>
---
drivers/media/video/v4l2-compat-ioctl32.c | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/drivers/media/video/v4l2-compat-ioctl32.c b/drivers/media/video/v4l2-compat-ioctl32.c
index d2f20c2..073f013 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) {
--
1.6.2.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: Your Webmail Update Alert
Next: [PATCH 2/2] bkl: Remove locked .ioctl file operation