media: video: move tegra/soc2030.c to unlocked_ioctl
authorErik Gilling <konkers@android.com>
Tue, 31 Aug 2010 01:13:35 +0000 (18:13 -0700)
committerColin Cross <ccross@android.com>
Thu, 7 Oct 2010 00:03:26 +0000 (17:03 -0700)
Change-Id: I8f530d09381d23815a094add40b80103efb3fab6

drivers/media/video/tegra/soc2030.c

index 785a0dded1cdd52329ac96457541a13cf6648c48..c7ed07bb237d3dbc98e950e6e62a506c957540e0 100644 (file)
@@ -949,8 +949,8 @@ static int soc2030_get_status(struct soc2030_info *info, u16 *status)
 }
 
 
-static int soc2030_ioctl(struct inode *inode, struct file *file,
-                        unsigned int cmd, unsigned long arg)
+static long soc2030_ioctl(struct file *file,
+                         unsigned int cmd, unsigned long arg)
 {
        struct soc2030_info *info = file->private_data;
 
@@ -1054,7 +1054,7 @@ int soc2030_release(struct inode *inode, struct file *file)
 static const struct file_operations soc2030_fileops = {
        .owner = THIS_MODULE,
        .open = soc2030_open,
-       .ioctl = soc2030_ioctl,
+       .unlocked_ioctl = soc2030_ioctl,
        .release = soc2030_release,
 };