diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-12-30 04:58:20 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-02 14:11:12 -0500 |
commit | bec43661b1dc0075b7445223ba775674133b164d (patch) | |
tree | 2a09ad5cc78799985e5cfb789f0a23db58e70499 /drivers/media/video/pvrusb2/pvrusb2-v4l2.c | |
parent | dfa9a5ae679ff2d23caa995d0f55a19abaf0596e (diff) |
V4L/DVB (10135): v4l2: introduce v4l2_file_operations.
Introduce a struct v4l2_file_operations for v4l2 drivers.
Remove the unnecessary inode argument.
Move compat32 handling (and llseek) into the v4l2-dev core: this is now
handled in the v4l2 core and no longer in the drivers themselves.
Note that this changeset reverts an earlier patch that changed the return
type of__video_ioctl2 from int to long. This change will be reinstated
later in a much improved version.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-v4l2.c')
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c index 52af1c435965..50554b44d355 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c +++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c | |||
@@ -948,7 +948,7 @@ static void pvr2_v4l2_internal_check(struct pvr2_channel *chp) | |||
948 | } | 948 | } |
949 | 949 | ||
950 | 950 | ||
951 | static int pvr2_v4l2_ioctl(struct inode *inode, struct file *file, | 951 | static int pvr2_v4l2_ioctl(struct file *file, |
952 | unsigned int cmd, unsigned long arg) | 952 | unsigned int cmd, unsigned long arg) |
953 | { | 953 | { |
954 | 954 | ||
@@ -960,7 +960,7 @@ static int pvr2_v4l2_ioctl(struct inode *inode, struct file *file, | |||
960 | } | 960 | } |
961 | 961 | ||
962 | 962 | ||
963 | static int pvr2_v4l2_release(struct inode *inode, struct file *file) | 963 | static int pvr2_v4l2_release(struct file *file) |
964 | { | 964 | { |
965 | struct pvr2_v4l2_fh *fhp = file->private_data; | 965 | struct pvr2_v4l2_fh *fhp = file->private_data; |
966 | struct pvr2_v4l2 *vp = fhp->vhead; | 966 | struct pvr2_v4l2 *vp = fhp->vhead; |
@@ -1008,7 +1008,7 @@ static int pvr2_v4l2_release(struct inode *inode, struct file *file) | |||
1008 | } | 1008 | } |
1009 | 1009 | ||
1010 | 1010 | ||
1011 | static int pvr2_v4l2_open(struct inode *inode, struct file *file) | 1011 | static int pvr2_v4l2_open(struct file *file) |
1012 | { | 1012 | { |
1013 | struct pvr2_v4l2_dev *dip; /* Our own context pointer */ | 1013 | struct pvr2_v4l2_dev *dip; /* Our own context pointer */ |
1014 | struct pvr2_v4l2_fh *fhp; | 1014 | struct pvr2_v4l2_fh *fhp; |
@@ -1235,13 +1235,12 @@ static unsigned int pvr2_v4l2_poll(struct file *file, poll_table *wait) | |||
1235 | } | 1235 | } |
1236 | 1236 | ||
1237 | 1237 | ||
1238 | static const struct file_operations vdev_fops = { | 1238 | static const struct v4l2_file_operations vdev_fops = { |
1239 | .owner = THIS_MODULE, | 1239 | .owner = THIS_MODULE, |
1240 | .open = pvr2_v4l2_open, | 1240 | .open = pvr2_v4l2_open, |
1241 | .release = pvr2_v4l2_release, | 1241 | .release = pvr2_v4l2_release, |
1242 | .read = pvr2_v4l2_read, | 1242 | .read = pvr2_v4l2_read, |
1243 | .ioctl = pvr2_v4l2_ioctl, | 1243 | .ioctl = pvr2_v4l2_ioctl, |
1244 | .llseek = no_llseek, | ||
1245 | .poll = pvr2_v4l2_poll, | 1244 | .poll = pvr2_v4l2_poll, |
1246 | }; | 1245 | }; |
1247 | 1246 | ||