Staging: sep: Fix use of legacy ioctl fop
authorAlan Cox <alan@linux.intel.com>
Mon, 4 Jan 2010 16:25:02 +0000 (16:25 +0000)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 4 Mar 2010 00:42:40 +0000 (16:42 -0800)
SEP doesn't need lock_kernel.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/sep/sep_driver.c

index a5d65b9afaab2e12c5a98a0bf28d2229ddf76f8f..92fa18655f8773f263219c878a8d0ae9d54ea650 100644 (file)
@@ -2233,7 +2233,7 @@ static int sep_set_flow_id_handler(struct sep_device *sep,
        return error;
 }
 
-static int sep_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg)
+static long sep_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 {
        int error = 0;
        struct sep_device *sep = filp->private_data;
@@ -2608,7 +2608,7 @@ static dev_t sep_devno;
 /* the files operations structure of the driver */
 static struct file_operations sep_file_operations = {
        .owner = THIS_MODULE,
-       .ioctl = sep_ioctl,
+       .unlocked_ioctl = sep_ioctl,
        .poll = sep_poll,
        .open = sep_open,
        .release = sep_release,