diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2007-03-10 10:52:02 +0100 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2007-03-10 10:52:02 +0100 |
| commit | 14f4257e6bc797cf765506a219f8af50a3e1586f (patch) | |
| tree | e2eee569d3290d8f109069453316dce302d61d73 /linux/drivers/media/video/ivtv/ivtv-vbi.c | |
| parent | 2b48db9d0abc9a080707fc51f452820c10eac666 (diff) | |
| download | mediapointer-dvb-s2-14f4257e6bc797cf765506a219f8af50a3e1586f.tar.gz mediapointer-dvb-s2-14f4257e6bc797cf765506a219f8af50a3e1586f.tar.bz2 | |
Merges VBI & YUV handling into a single work queue.
From: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Ian Armstrong <ian@iarmst.demon.co.uk>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtv-vbi.c')
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-vbi.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-vbi.c b/linux/drivers/media/video/ivtv/ivtv-vbi.c index 71acc97b1..5efa5a867 100644 --- a/linux/drivers/media/video/ivtv/ivtv-vbi.c +++ b/linux/drivers/media/video/ivtv/ivtv-vbi.c @@ -32,11 +32,6 @@ static int odd_parity(u8 c) return c & 1; } -void vbi_schedule_work(struct ivtv *itv) -{ - queue_work(itv->vbi.work_queues, &itv->vbi.work_queue); -} - static void passthrough_vbi_data(struct ivtv *itv, int cnt) { int wss = 0; @@ -454,18 +449,10 @@ void ivtv_disable_vbi(struct ivtv *itv) itv->vbi.cc_pos = 0; } -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20) -void vbi_work_handler(struct work_struct *work) -{ - struct vbi_info *info = container_of(work, struct vbi_info, work_queue); - struct ivtv *itv = container_of(info, struct ivtv, vbi); -#else -void vbi_work_handler(void *arg) + +void vbi_work_handler(struct ivtv *itv) { - struct ivtv *itv = arg; -#endif struct v4l2_sliced_vbi_data data; - DEFINE_WAIT(wait); /* Lock */ if (itv->output_mode == OUT_PASSTHROUGH) { |