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/saa7127.c | |
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/saa7127.c')
-rw-r--r-- | drivers/media/video/saa7127.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/media/video/saa7127.c b/drivers/media/video/saa7127.c index 128bb8b8dbbf..2fe7a701b954 100644 --- a/drivers/media/video/saa7127.c +++ b/drivers/media/video/saa7127.c | |||
@@ -570,15 +570,16 @@ static int saa7127_s_std_output(struct v4l2_subdev *sd, v4l2_std_id std) | |||
570 | return saa7127_set_std(sd, std); | 570 | return saa7127_set_std(sd, std); |
571 | } | 571 | } |
572 | 572 | ||
573 | static int saa7127_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route) | 573 | static int saa7127_s_routing(struct v4l2_subdev *sd, |
574 | u32 input, u32 output, u32 config) | ||
574 | { | 575 | { |
575 | struct saa7127_state *state = to_state(sd); | 576 | struct saa7127_state *state = to_state(sd); |
576 | int rc = 0; | 577 | int rc = 0; |
577 | 578 | ||
578 | if (state->input_type != route->input) | 579 | if (state->input_type != input) |
579 | rc = saa7127_set_input_type(sd, route->input); | 580 | rc = saa7127_set_input_type(sd, input); |
580 | if (rc == 0 && state->output_type != route->output) | 581 | if (rc == 0 && state->output_type != output) |
581 | rc = saa7127_set_output_type(sd, route->output); | 582 | rc = saa7127_set_output_type(sd, output); |
582 | return rc; | 583 | return rc; |
583 | } | 584 | } |
584 | 585 | ||