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

[linux-2.6-block.git] / drivers / usb / core / devio.c

diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index 879d03f5127c7e8963a0523d9c18b4f622e0470f..12bb5722b420eb506efa39b81f9230977c8e5c58 100644 (file)
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -2698,18 +2698,6 @@ static long usbdev_ioctl(struct file *file, unsigned int cmd,
        return ret;
 }
 
-#ifdef CONFIG_COMPAT
-static long usbdev_compat_ioctl(struct file *file, unsigned int cmd,
-                       unsigned long arg)
-{
-       int ret;
-
-       ret = usbdev_do_ioctl(file, cmd, compat_ptr(arg));
-
-       return ret;
-}
-#endif
-
 /* No kernel lock - fine */
 static __poll_t usbdev_poll(struct file *file,
                                struct poll_table_struct *wait)
@@ -2733,9 +2721,7 @@ const struct file_operations usbdev_file_operations = {
        .read =           usbdev_read,
        .poll =           usbdev_poll,
        .unlocked_ioctl = usbdev_ioctl,
-#ifdef CONFIG_COMPAT
-       .compat_ioctl =   usbdev_compat_ioctl,
-#endif
+       .compat_ioctl =   compat_ptr_ioctl,
        .mmap =           usbdev_mmap,
        .open =           usbdev_open,
        .release =        usbdev_release,