diff options
author | Andrew Morton <akpm@osdl.org> | 2006-04-27 11:01:18 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-25 00:58:10 -0400 |
commit | 1b77c54ee11ebe36ce4d0fe805e50aaafa6304b4 (patch) | |
tree | 6a02f82320387aaf197d0bce061f270ec00dc5de /fs/compat_ioctl.c | |
parent | 8a17ef975648ce96b6a83b872b6ff4be6fdcd2a4 (diff) |
V4L/DVB (3809a): Remove compat stuff for DMX_GET_EVENT
The ioctl were removed by:
V4L/DVB (3727): Remove DMX_GET_EVENT and associated data structures
due to the ioctl DMX_GET_EVENT has never been implemented, and also
scrambling events can't be generated in a useful way by the hardware.
This patch removes the corresponding entry at fs/compat_ioctl.c
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'fs/compat_ioctl.c')
-rw-r--r-- | fs/compat_ioctl.c | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index d2c38875ab29..9eb9824dd332 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c | |||
@@ -205,38 +205,6 @@ static int do_ext3_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg) | |||
205 | return sys_ioctl(fd, cmd, (unsigned long)compat_ptr(arg)); | 205 | return sys_ioctl(fd, cmd, (unsigned long)compat_ptr(arg)); |
206 | } | 206 | } |
207 | 207 | ||
208 | struct compat_dmx_event { | ||
209 | dmx_event_t event; | ||
210 | compat_time_t timeStamp; | ||
211 | union | ||
212 | { | ||
213 | dmx_scrambling_status_t scrambling; | ||
214 | } u; | ||
215 | }; | ||
216 | |||
217 | static int do_dmx_get_event(unsigned int fd, unsigned int cmd, unsigned long arg) | ||
218 | { | ||
219 | struct dmx_event kevent; | ||
220 | mm_segment_t old_fs = get_fs(); | ||
221 | int err; | ||
222 | |||
223 | set_fs(KERNEL_DS); | ||
224 | err = sys_ioctl(fd, cmd, (unsigned long) &kevent); | ||
225 | set_fs(old_fs); | ||
226 | |||
227 | if (!err) { | ||
228 | struct compat_dmx_event __user *up = compat_ptr(arg); | ||
229 | |||
230 | err = put_user(kevent.event, &up->event); | ||
231 | err |= put_user(kevent.timeStamp, &up->timeStamp); | ||
232 | err |= put_user(kevent.u.scrambling, &up->u.scrambling); | ||
233 | if (err) | ||
234 | err = -EFAULT; | ||
235 | } | ||
236 | |||
237 | return err; | ||
238 | } | ||
239 | |||
240 | struct compat_video_event { | 208 | struct compat_video_event { |
241 | int32_t type; | 209 | int32_t type; |
242 | compat_time_t timestamp; | 210 | compat_time_t timestamp; |
@@ -2964,7 +2932,6 @@ HANDLE_IOCTL(NCP_IOC_SETPRIVATEDATA_32, do_ncp_setprivatedata) | |||
2964 | #endif | 2932 | #endif |
2965 | 2933 | ||
2966 | /* dvb */ | 2934 | /* dvb */ |
2967 | HANDLE_IOCTL(DMX_GET_EVENT, do_dmx_get_event) | ||
2968 | HANDLE_IOCTL(VIDEO_GET_EVENT, do_video_get_event) | 2935 | HANDLE_IOCTL(VIDEO_GET_EVENT, do_video_get_event) |
2969 | HANDLE_IOCTL(VIDEO_STILLPICTURE, do_video_stillpicture) | 2936 | HANDLE_IOCTL(VIDEO_STILLPICTURE, do_video_stillpicture) |
2970 | HANDLE_IOCTL(VIDEO_SET_SPU_PALETTE, do_video_set_spu_palette) | 2937 | HANDLE_IOCTL(VIDEO_SET_SPU_PALETTE, do_video_set_spu_palette) |