Staging: go7007: fixes due v4l2_file_operations api change

[linux-2.6-block.git] / drivers / staging / go7007 / go7007-v4l2.c

diff --git a/drivers/staging/go7007/go7007-v4l2.c b/drivers/staging/go7007/go7007-v4l2.c
index 94e1141a1fcdf9e6b656531d1aa9bce2c2f36cd4..dfbc2e91c23bcecb218e81373f3e69bfeef874b8 100644 (file)
--- 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)
        return 0;
 }
 
-static int go7007_open(struct inode *inode, struct file *file)
+static int go7007_open(struct file *file)
 {
        struct go7007 *go = video_get_drvdata(video_devdata(file));
        struct go7007_file *gofh;
@@ -99,7 +99,7 @@ static int go7007_open(struct inode *inode, struct file *file)
        return 0;
 }
 
-static int go7007_release(struct inode *inode, struct file *file)
+static int go7007_release(struct file *file)
 {
        struct go7007_file *gofh = file->private_data;
        struct go7007 *go = gofh->go;
@@ -375,8 +375,7 @@ static int clip_to_modet_map(struct go7007 *go, int region,
        return 0;
 }
 
-static int go7007_do_ioctl(struct inode *inode, struct file *file,
-               unsigned int cmd, void *arg)
+static long go7007_do_ioctl(struct file *file, unsigned int cmd, void *arg)
 {
        struct go7007_file *gofh = file->private_data;
        struct go7007 *go = gofh->go;
@@ -1327,15 +1326,14 @@ unlock_and_return:
        return retval;
 }
 
-static int go7007_ioctl(struct inode *inode, struct file *file,
-               unsigned int cmd, unsigned long arg)
+static long go7007_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
        struct go7007_file *gofh = file->private_data;
 
        if (gofh->go->status != STATUS_ONLINE)
                return -EIO;
 
-       return video_usercopy(inode, file, cmd, arg, go7007_do_ioctl);
+       return video_usercopy(file, cmd, arg, go7007_do_ioctl);
 }
 
 static ssize_t go7007_read(struct file *file, char __user *data,
@@ -1441,12 +1439,11 @@ static void go7007_vfl_release(struct video_device *vfd)
                kfree(go);
 }
 
-static struct file_operations go7007_fops = {
+static struct v4l2_file_operations go7007_fops = {
        .owner          = THIS_MODULE,
        .open           = go7007_open,
        .release        = go7007_release,
        .ioctl          = go7007_ioctl,
-       .llseek         = no_llseek,
        .read           = go7007_read,
        .mmap           = go7007_mmap,
        .poll           = go7007_poll,