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/v4l2-compat-ioctl32.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/v4l2-compat-ioctl32.c')
-rw-r--r-- | drivers/media/video/v4l2-compat-ioctl32.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/media/video/v4l2-compat-ioctl32.c b/drivers/media/video/v4l2-compat-ioctl32.c index 26fdf1e4a2f9..b4f391431853 100644 --- a/drivers/media/video/v4l2-compat-ioctl32.c +++ b/drivers/media/video/v4l2-compat-ioctl32.c | |||
@@ -1072,12 +1072,7 @@ long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg) | |||
1072 | } | 1072 | } |
1073 | return ret; | 1073 | return ret; |
1074 | } | 1074 | } |
1075 | #else | ||
1076 | long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg) | ||
1077 | { | ||
1078 | return -ENOIOCTLCMD; | ||
1079 | } | ||
1080 | #endif | ||
1081 | EXPORT_SYMBOL_GPL(v4l_compat_ioctl32); | 1075 | EXPORT_SYMBOL_GPL(v4l_compat_ioctl32); |
1076 | #endif | ||
1082 | 1077 | ||
1083 | MODULE_LICENSE("GPL"); | 1078 | MODULE_LICENSE("GPL"); |