Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6d7ba8b authored by Frederic Weisbecker's avatar Frederic Weisbecker
Browse files

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: default avatarFrederic 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>
parent 02d6d685

drivers/media/video/v4l2-compat-ioctl32.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -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) {