Merge branch 'tracing/kmemtrace' into tracing/kmemtrace2

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c
index 1efc5f3462c6..a72a361daade 100644
--- a/drivers/media/video/vino.c
+++ b/drivers/media/video/vino.c
@@ -4237,8 +4237,7 @@ error:
         return ret;
 }
 
-static int vino_do_ioctl(struct inode *inode, struct file *file,
-                      unsigned int cmd, void *arg)
+static int vino_do_ioctl(struct file *file, unsigned int cmd, void *arg)
 {
         struct vino_channel_settings *vcs = video_drvdata(file);
 
@@ -4353,7 +4352,7 @@ static int vino_ioctl(struct inode *inode, struct file *file,
         if (mutex_lock_interruptible(&vcs->mutex))
                 return -EINTR;
 
-        ret = video_usercopy(inode, file, cmd, arg, vino_do_ioctl);
+        ret = video_usercopy(file, cmd, arg, vino_do_ioctl);
 
         mutex_unlock(&vcs->mutex);