diff options
| author |   Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-05 10:21:08 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-06 13:51:38 -0800 |
| commit | 60572c0d8b8a5164445b3ebcaa0b15f7935f321a (patch) | |
| tree | 10276af8d0924be0a2b11bc9352958e7e0244bbb /drivers/staging/go7007 | |
| parent | Staging: go7007: fixes due to video_usercopy api change (diff) | |
| download | linux-dev-60572c0d8b8a5164445b3ebcaa0b15f7935f321a.tar.xz linux-dev-60572c0d8b8a5164445b3ebcaa0b15f7935f321a.zip | |
Staging: go7007: fixes due v4l2_file_operations api change
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>
Diffstat (limited to 'drivers/staging/go7007')
| -rw-r--r-- | drivers/staging/go7007/go7007-v4l2.c | 10 |
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) 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, |