media: video: tegra: dw9714l: Convert ioctl to unlocked_ioctl
authorColin Cross <ccross@android.com>
Wed, 22 Sep 2010 06:35:28 +0000 (23:35 -0700)
committerColin Cross <ccross@android.com>
Thu, 7 Oct 2010 00:03:37 +0000 (17:03 -0700)
Change-Id: If43ceacb5739f8f98b550b16150d1b04b1ba485d
Signed-off-by: Colin Cross <ccross@android.com>
drivers/media/video/tegra/dw9714l.c

index 26c36c3a0803385e10f8ce0483f4f05c707a3c1a..e940501d92abf79a52261c0f45233c73c746317e 100644 (file)
@@ -156,7 +156,7 @@ static int dw9714l_set_position(struct dw9714l_info *info, u32 position)
        return ret;
 }
 
-static int dw9714l_ioctl(struct inode *inode, struct file *file,
+static long dw9714l_ioctl(struct file *file,
                        unsigned int cmd, unsigned long arg)
 {
        struct dw9714l_info *info = file->private_data;
@@ -221,7 +221,7 @@ int dw9714l_release(struct inode *inode, struct file *file)
 static const struct file_operations dw9714l_fileops = {
        .owner = THIS_MODULE,
        .open = dw9714l_open,
-       .ioctl = dw9714l_ioctl,
+       .unlocked_ioctl = dw9714l_ioctl,
        .release = dw9714l_release,
 };