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/saa7191.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/saa7191.c')
-rw-r--r-- | drivers/media/video/saa7191.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/saa7191.c b/drivers/media/video/saa7191.c index 13ab4f2ddcc5..a2513772196b 100644 --- a/drivers/media/video/saa7191.c +++ b/drivers/media/video/saa7191.c | |||
@@ -160,14 +160,14 @@ static int saa7191_write_block(struct v4l2_subdev *sd, | |||
160 | /* Helper functions */ | 160 | /* Helper functions */ |
161 | 161 | ||
162 | static int saa7191_s_routing(struct v4l2_subdev *sd, | 162 | static int saa7191_s_routing(struct v4l2_subdev *sd, |
163 | const struct v4l2_routing *route) | 163 | u32 input, u32 output, u32 config) |
164 | { | 164 | { |
165 | struct saa7191 *decoder = to_saa7191(sd); | 165 | struct saa7191 *decoder = to_saa7191(sd); |
166 | u8 luma = saa7191_read_reg(sd, SAA7191_REG_LUMA); | 166 | u8 luma = saa7191_read_reg(sd, SAA7191_REG_LUMA); |
167 | u8 iock = saa7191_read_reg(sd, SAA7191_REG_IOCK); | 167 | u8 iock = saa7191_read_reg(sd, SAA7191_REG_IOCK); |
168 | int err; | 168 | int err; |
169 | 169 | ||
170 | switch (route->input) { | 170 | switch (input) { |
171 | case SAA7191_INPUT_COMPOSITE: /* Set Composite input */ | 171 | case SAA7191_INPUT_COMPOSITE: /* Set Composite input */ |
172 | iock &= ~(SAA7191_IOCK_CHRS | SAA7191_IOCK_GPSW1 | 172 | iock &= ~(SAA7191_IOCK_CHRS | SAA7191_IOCK_GPSW1 |
173 | | SAA7191_IOCK_GPSW2); | 173 | | SAA7191_IOCK_GPSW2); |
@@ -190,7 +190,7 @@ static int saa7191_s_routing(struct v4l2_subdev *sd, | |||
190 | if (err) | 190 | if (err) |
191 | return -EIO; | 191 | return -EIO; |
192 | 192 | ||
193 | decoder->input = route->input; | 193 | decoder->input = input; |
194 | 194 | ||
195 | return 0; | 195 | return 0; |
196 | } | 196 | } |