From: Colin Cross <ccross@android.com>
Date: Wed, 22 Sep 2010 06:35:28 +0000 (-0700)
Subject: media: video: tegra: dw9714l: Convert ioctl to unlocked_ioctl
X-Git-Tag: firefly_0821_release~9834^2~490
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=eab7b3ca6dcd6e83a241f0bce0418233222a73b3;p=firefly-linux-kernel-4.4.55.git

media: video: tegra: dw9714l: Convert ioctl to unlocked_ioctl

Change-Id: If43ceacb5739f8f98b550b16150d1b04b1ba485d
Signed-off-by: Colin Cross <ccross@android.com>
---

diff --git a/drivers/media/video/tegra/dw9714l.c b/drivers/media/video/tegra/dw9714l.c
index 26c36c3a0803..e940501d92ab 100644
--- a/drivers/media/video/tegra/dw9714l.c
+++ b/drivers/media/video/tegra/dw9714l.c
@@ -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,
 };