]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
Staging: go7007: fixes due v4l2_file_operations api change
authorGreg Kroah-Hartman <gregkh@suse.de>
Mon, 5 Jan 2009 18:21:08 +0000 (10:21 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 6 Jan 2009 21:51:38 +0000 (13:51 -0800)
v4l2_file_operations was introduced, so use it to fix up
the build errors in the go7007 driver.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/go7007/go7007-v4l2.c

index b925761350c26939645df331cf6bc140063291e3..dfbc2e91c23bcecb218e81373f3e69bfeef874b8 100644 (file)
@@ -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;
@@ -1326,8 +1326,7 @@ 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;
 
@@ -1440,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,