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/bt856.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/bt856.c')
-rw-r--r-- | drivers/media/video/bt856.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c index 78db39503947..d0b4d4925ff8 100644 --- a/drivers/media/video/bt856.c +++ b/drivers/media/video/bt856.c | |||
@@ -142,16 +142,17 @@ static int bt856_s_std_output(struct v4l2_subdev *sd, v4l2_std_id std) | |||
142 | return 0; | 142 | return 0; |
143 | } | 143 | } |
144 | 144 | ||
145 | static int bt856_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route) | 145 | static int bt856_s_routing(struct v4l2_subdev *sd, |
146 | u32 input, u32 output, u32 config) | ||
146 | { | 147 | { |
147 | struct bt856 *encoder = to_bt856(sd); | 148 | struct bt856 *encoder = to_bt856(sd); |
148 | 149 | ||
149 | v4l2_dbg(1, debug, sd, "set input %d\n", route->input); | 150 | v4l2_dbg(1, debug, sd, "set input %d\n", input); |
150 | 151 | ||
151 | /* We only have video bus. | 152 | /* We only have video bus. |
152 | * route->input= 0: input is from bt819 | 153 | * input= 0: input is from bt819 |
153 | * route->input= 1: input is from ZR36060 */ | 154 | * input= 1: input is from ZR36060 */ |
154 | switch (route->input) { | 155 | switch (input) { |
155 | case 0: | 156 | case 0: |
156 | bt856_setbit(encoder, 0xde, 4, 0); | 157 | bt856_setbit(encoder, 0xde, 4, 0); |
157 | bt856_setbit(encoder, 0xde, 3, 1); | 158 | bt856_setbit(encoder, 0xde, 3, 1); |