Merge tag 'firewire-update' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[sfrench/cifs-2.6.git] / drivers / firewire / core-cdev.c

diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
index 719791819c247385535fc01215a0d41e095dbe8f..6e291d8f3a278556c8d0349b7aed9c8d9e67db9c 100644 (file)
--- a/drivers/firewire/core-cdev.c
+++ b/drivers/firewire/core-cdev.c
@@ -1646,14 +1646,6 @@ static long fw_device_op_ioctl(struct file *file,
        return dispatch_ioctl(file->private_data, cmd, (void __user *)arg);
 }
 
-#ifdef CONFIG_COMPAT
-static long fw_device_op_compat_ioctl(struct file *file,
-                                     unsigned int cmd, unsigned long arg)
-{
-       return dispatch_ioctl(file->private_data, cmd, compat_ptr(arg));
-}
-#endif
-
 static int fw_device_op_mmap(struct file *file, struct vm_area_struct *vma)
 {
        struct client *client = file->private_data;
@@ -1796,7 +1788,5 @@ const struct file_operations fw_device_ops = {
        .mmap           = fw_device_op_mmap,
        .release        = fw_device_op_release,
        .poll           = fw_device_op_poll,
-#ifdef CONFIG_COMPAT
-       .compat_ioctl   = fw_device_op_compat_ioctl,
-#endif
+       .compat_ioctl   = compat_ptr_ioctl,
 };