- patches.suse/slab-handle-memoryless-nodes-v2a.patch: Refresh.

[linux-flexiantxendom0-3.2.10.git] / drivers / staging / comedi / comedi_fops.c

diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index aaad76e..8117748 100644 (file)
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -110,13 +110,8 @@ static struct device_attribute dev_attr_read_buffer_kb;
 static struct device_attribute dev_attr_max_write_buffer_kb;
 static struct device_attribute dev_attr_write_buffer_kb;
 
-#ifdef HAVE_UNLOCKED_IOCTL
 static long comedi_unlocked_ioctl(struct file *file, unsigned int cmd,
                                  unsigned long arg)
-#else
-static int comedi_ioctl(struct inode *inode, struct file *file,
-                       unsigned int cmd, unsigned long arg)
-#endif
 {
        const unsigned minor = iminor(file->f_dentry->d_inode);
        struct comedi_device_file_info *dev_file_info =
@@ -1867,14 +1862,8 @@ static int comedi_fasync(int fd, struct file *file, int on)
 
 const struct file_operations comedi_fops = {
        .owner = THIS_MODULE,
-#ifdef HAVE_UNLOCKED_IOCTL
        .unlocked_ioctl = comedi_unlocked_ioctl,
-#else
-       .ioctl = comedi_ioctl,
-#endif
-#ifdef HAVE_COMPAT_IOCTL
        .compat_ioctl = comedi_compat_ioctl,
-#endif
        .open = comedi_open,
        .release = comedi_close,
        .read = comedi_read,
@@ -1959,8 +1948,6 @@ static int __init comedi_init(void)
                }
        }
 
-       comedi_register_ioctl32();
-
        return 0;
 }
 
@@ -1977,8 +1964,6 @@ static void __exit comedi_cleanup(void)
        unregister_chrdev_region(MKDEV(COMEDI_MAJOR, 0), COMEDI_NUM_MINORS);
 
        comedi_proc_cleanup();
-
-       comedi_unregister_ioctl32();
 }
 
 module_init(comedi_init);