diff options
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-vbi.c')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-vbi.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/media/video/ivtv/ivtv-vbi.c b/drivers/media/video/ivtv/ivtv-vbi.c index b53ca508dacc..5efa5a867818 100644 --- a/drivers/media/video/ivtv/ivtv-vbi.c +++ b/drivers/media/video/ivtv/ivtv-vbi.c | |||
@@ -32,11 +32,6 @@ static int odd_parity(u8 c) | |||
32 | return c & 1; | 32 | return c & 1; |
33 | } | 33 | } |
34 | 34 | ||
35 | void vbi_schedule_work(struct ivtv *itv) | ||
36 | { | ||
37 | queue_work(itv->vbi.work_queues, &itv->vbi.work_queue); | ||
38 | } | ||
39 | |||
40 | static void passthrough_vbi_data(struct ivtv *itv, int cnt) | 35 | static void passthrough_vbi_data(struct ivtv *itv, int cnt) |
41 | { | 36 | { |
42 | int wss = 0; | 37 | int wss = 0; |
@@ -454,12 +449,10 @@ void ivtv_disable_vbi(struct ivtv *itv) | |||
454 | itv->vbi.cc_pos = 0; | 449 | itv->vbi.cc_pos = 0; |
455 | } | 450 | } |
456 | 451 | ||
457 | void vbi_work_handler(struct work_struct *work) | 452 | |
453 | void vbi_work_handler(struct ivtv *itv) | ||
458 | { | 454 | { |
459 | struct vbi_info *info = container_of(work, struct vbi_info, work_queue); | ||
460 | struct ivtv *itv = container_of(info, struct ivtv, vbi); | ||
461 | struct v4l2_sliced_vbi_data data; | 455 | struct v4l2_sliced_vbi_data data; |
462 | DEFINE_WAIT(wait); | ||
463 | 456 | ||
464 | /* Lock */ | 457 | /* Lock */ |
465 | if (itv->output_mode == OUT_PASSTHROUGH) { | 458 | if (itv->output_mode == OUT_PASSTHROUGH) { |