From: Erik Gilling <konkers@android.com>
Date: Tue, 31 Aug 2010 01:13:35 +0000 (-0700)
Subject: media: video: move tegra/soc2030.c to unlocked_ioctl
X-Git-Tag: firefly_0821_release~9834^2~502
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=256e7847374a8d7098b29866b545896f4bc57421;p=firefly-linux-kernel-4.4.55.git

media: video: move tegra/soc2030.c to unlocked_ioctl

Change-Id: I8f530d09381d23815a094add40b80103efb3fab6
---

diff --git a/drivers/media/video/tegra/soc2030.c b/drivers/media/video/tegra/soc2030.c
index 785a0dded1cd..c7ed07bb237d 100644
--- a/drivers/media/video/tegra/soc2030.c
+++ b/drivers/media/video/tegra/soc2030.c
@@ -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,
 };