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

[linux-2.6-block.git] / drivers / misc / mei / main.c

diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c
index 4ef6e37caafc3539518ad77701b4b7245da5e816..f17297f2943d37fc82a7fce8d77eeebaa1bcf79d 100644 (file)
--- a/drivers/misc/mei/main.c
+++ b/drivers/misc/mei/main.c
@@ -532,24 +532,6 @@ out:
        return rets;
 }
 
-/**
- * mei_compat_ioctl - the compat IOCTL function
- *
- * @file: pointer to file structure
- * @cmd: ioctl command
- * @data: pointer to mei message structure
- *
- * Return: 0 on success , <0 on error
- */
-#ifdef CONFIG_COMPAT
-static long mei_compat_ioctl(struct file *file,
-                       unsigned int cmd, unsigned long data)
-{
-       return mei_ioctl(file, cmd, (unsigned long)compat_ptr(data));
-}
-#endif
-
-
 /**
  * mei_poll - the poll function
  *
@@ -922,9 +904,7 @@ static const struct file_operations mei_fops = {
        .owner = THIS_MODULE,
        .read = mei_read,
        .unlocked_ioctl = mei_ioctl,
-#ifdef CONFIG_COMPAT
-       .compat_ioctl = mei_compat_ioctl,
-#endif
+       .compat_ioctl = compat_ptr_ioctl,
        .open = mei_open,
        .release = mei_release,
        .write = mei_write,