mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-23 23:21:46 +00:00
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
1 changed files with 1 additions and 6 deletions
|
@ -228,11 +228,6 @@ static long native_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
|
||||||
|
|
||||||
if (file->f_op->unlocked_ioctl)
|
if (file->f_op->unlocked_ioctl)
|
||||||
ret = file->f_op->unlocked_ioctl(file, cmd, arg);
|
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;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -973,7 +968,7 @@ long v4l2_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg)
|
||||||
{
|
{
|
||||||
long ret = -ENOIOCTLCMD;
|
long ret = -ENOIOCTLCMD;
|
||||||
|
|
||||||
if (!file->f_op->ioctl && !file->f_op->unlocked_ioctl)
|
if (!file->f_op->unlocked_ioctl)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
switch (cmd) {
|
switch (cmd) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue