diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-04-02 10:26:22 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-06 20:44:27 -0400 |
commit | 5325b4272a53b43f55b82cc369c310c2fcacdca1 (patch) | |
tree | f2a1491de3d05901152e0e271c0cb5ce381884c2 /drivers/media/video/cx88 | |
parent | c0ff29150d37615ac703802ab3edc775fd402491 (diff) |
V4L/DVB (11380): v4l2-subdev: change s_routing prototype
It is no longer needed to use a struct pointer as argument, since v4l2_subdev
doesn't require that ioctl-like approach anymore. Instead just pass the input,
output and config (new!) arguments directly.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx88')
-rw-r--r-- | drivers/media/video/cx88/cx88-video.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c index 61afa89f7b11..ec0425d9043a 100644 --- a/drivers/media/video/cx88/cx88-video.c +++ b/drivers/media/video/cx88/cx88-video.c | |||
@@ -428,10 +428,8 @@ int cx88_video_mux(struct cx88_core *core, unsigned int input) | |||
428 | routes for different inputs. HVR-1300 surely does */ | 428 | routes for different inputs. HVR-1300 surely does */ |
429 | if (core->board.audio_chip && | 429 | if (core->board.audio_chip && |
430 | core->board.audio_chip == V4L2_IDENT_WM8775) { | 430 | core->board.audio_chip == V4L2_IDENT_WM8775) { |
431 | struct v4l2_routing route; | 431 | call_all(core, audio, s_routing, |
432 | 432 | INPUT(input).audioroute, 0, 0); | |
433 | route.input = INPUT(input).audioroute; | ||
434 | call_all(core, audio, s_routing, &route); | ||
435 | } | 433 | } |
436 | /* cx2388's C-ADC is connected to the tuner only. | 434 | /* cx2388's C-ADC is connected to the tuner only. |
437 | When used with S-Video, that ADC is busy dealing with | 435 | When used with S-Video, that ADC is busy dealing with |
@@ -823,10 +821,8 @@ static int video_open(struct file *file) | |||
823 | if (core->board.radio.audioroute) { | 821 | if (core->board.radio.audioroute) { |
824 | if(core->board.audio_chip && | 822 | if(core->board.audio_chip && |
825 | core->board.audio_chip == V4L2_IDENT_WM8775) { | 823 | core->board.audio_chip == V4L2_IDENT_WM8775) { |
826 | struct v4l2_routing route; | 824 | call_all(core, audio, s_routing, |
827 | 825 | core->board.radio.audioroute, 0, 0); | |
828 | route.input = core->board.radio.audioroute; | ||
829 | call_all(core, audio, s_routing, &route); | ||
830 | } | 826 | } |
831 | /* "I2S ADC mode" */ | 827 | /* "I2S ADC mode" */ |
832 | core->tvaudio = WW_I2SADC; | 828 | core->tvaudio = WW_I2SADC; |