aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/go7007/go7007-v4l2.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/staging/go7007/go7007-v4l2.c b/drivers/staging/go7007/go7007-v4l2.c
index b925761350c2..dfbc2e91c23b 100644
--- a/drivers/staging/go7007/go7007-v4l2.c
+++ b/drivers/staging/go7007/go7007-v4l2.c
@@ -81,7 +81,7 @@ static int go7007_streamoff(struct go7007 *go)
81 return 0; 81 return 0;
82} 82}
83 83
84static int go7007_open(struct inode *inode, struct file *file) 84static int go7007_open(struct file *file)
85{ 85{
86 struct go7007 *go = video_get_drvdata(video_devdata(file)); 86 struct go7007 *go = video_get_drvdata(video_devdata(file));
87 struct go7007_file *gofh; 87 struct go7007_file *gofh;
@@ -99,7 +99,7 @@ static int go7007_open(struct inode *inode, struct file *file)
99 return 0; 99 return 0;
100} 100}
101 101
102static int go7007_release(struct inode *inode, struct file *file) 102static int go7007_release(struct file *file)
103{ 103{
104 struct go7007_file *gofh = file->private_data; 104 struct go7007_file *gofh = file->private_data;
105 struct go7007 *go = gofh->go; 105 struct go7007 *go = gofh->go;
@@ -1326,8 +1326,7 @@ unlock_and_return:
1326 return retval; 1326 return retval;
1327} 1327}
1328 1328
1329static int go7007_ioctl(struct inode *inode, struct file *file, 1329static long go7007_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
1330 unsigned int cmd, unsigned long arg)
1331{ 1330{
1332 struct go7007_file *gofh = file->private_data; 1331 struct go7007_file *gofh = file->private_data;
1333 1332
@@ -1440,12 +1439,11 @@ static void go7007_vfl_release(struct video_device *vfd)
1440 kfree(go); 1439 kfree(go);
1441} 1440}
1442 1441
1443static struct file_operations go7007_fops = { 1442static struct v4l2_file_operations go7007_fops = {
1444 .owner = THIS_MODULE, 1443 .owner = THIS_MODULE,
1445 .open = go7007_open, 1444 .open = go7007_open,
1446 .release = go7007_release, 1445 .release = go7007_release,
1447 .ioctl = go7007_ioctl, 1446 .ioctl = go7007_ioctl,
1448 .llseek = no_llseek,
1449 .read = go7007_read, 1447 .read = go7007_read,
1450 .mmap = go7007_mmap, 1448 .mmap = go7007_mmap,
1451 .poll = go7007_poll, 1449 .poll = go7007_poll,