From 256e7847374a8d7098b29866b545896f4bc57421 Mon Sep 17 00:00:00 2001 From: Erik Gilling Date: Mon, 30 Aug 2010 18:13:35 -0700 Subject: [PATCH] media: video: move tegra/soc2030.c to unlocked_ioctl Change-Id: I8f530d09381d23815a094add40b80103efb3fab6 --- drivers/media/video/tegra/soc2030.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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, }; -- 2.34.1