Merge tag 'compat-ioctl-5.5' of git://git.kernel.org:/pub/scm/linux/kernel/git/arnd...

[linux-2.6-block.git] / drivers / vhost / test.c

diff --git a/drivers/vhost/test.c b/drivers/vhost/test.c
index 056308008288c80dc14efbf6c437cbc6940129dd..e37c92d4d7ada2ca4f06b8f91d3f6b2a6b303610 100644 (file)
--- a/drivers/vhost/test.c
+++ b/drivers/vhost/test.c
@@ -304,21 +304,11 @@ static long vhost_test_ioctl(struct file *f, unsigned int ioctl,
        }
 }
 
-#ifdef CONFIG_COMPAT
-static long vhost_test_compat_ioctl(struct file *f, unsigned int ioctl,
-                                  unsigned long arg)
-{
-       return vhost_test_ioctl(f, ioctl, (unsigned long)compat_ptr(arg));
-}
-#endif
-
 static const struct file_operations vhost_test_fops = {
        .owner          = THIS_MODULE,
        .release        = vhost_test_release,
        .unlocked_ioctl = vhost_test_ioctl,
-#ifdef CONFIG_COMPAT
-       .compat_ioctl   = vhost_test_compat_ioctl,
-#endif
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = vhost_test_open,
        .llseek         = noop_llseek,
 };