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/saa7185.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/saa7185.c')
-rw-r--r-- | drivers/media/video/saa7185.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c index 75747b104d07..212baa10829b 100644 --- a/drivers/media/video/saa7185.c +++ b/drivers/media/video/saa7185.c | |||
@@ -245,14 +245,15 @@ static int saa7185_s_std_output(struct v4l2_subdev *sd, v4l2_std_id std) | |||
245 | return 0; | 245 | return 0; |
246 | } | 246 | } |
247 | 247 | ||
248 | static int saa7185_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route) | 248 | static int saa7185_s_routing(struct v4l2_subdev *sd, |
249 | u32 input, u32 output, u32 config) | ||
249 | { | 250 | { |
250 | struct saa7185 *encoder = to_saa7185(sd); | 251 | struct saa7185 *encoder = to_saa7185(sd); |
251 | 252 | ||
252 | /* RJ: route->input = 0: input is from SA7111 | 253 | /* RJ: input = 0: input is from SA7111 |
253 | route->input = 1: input is from ZR36060 */ | 254 | input = 1: input is from ZR36060 */ |
254 | 255 | ||
255 | switch (route->input) { | 256 | switch (input) { |
256 | case 0: | 257 | case 0: |
257 | /* turn off colorbar */ | 258 | /* turn off colorbar */ |
258 | saa7185_write(sd, 0x3a, 0x0f); | 259 | saa7185_write(sd, 0x3a, 0x0f); |