summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/saa7191.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-04-02 16:26:22 +0200
committerHans Verkuil <hverkuil@xs4all.nl>2009-04-02 16:26:22 +0200
commitb4d23428b3c4456414ad8bf5e974757fd354a66f (patch)
treef34d81519e2a8311aba732911b91889014c8a1b3 /linux/drivers/media/video/saa7191.c
parent696781508adb89f4ff88ecc99c83092cc031dd7b (diff)
downloadmediapointer-dvb-s2-b4d23428b3c4456414ad8bf5e974757fd354a66f.tar.gz
mediapointer-dvb-s2-b4d23428b3c4456414ad8bf5e974757fd354a66f.tar.bz2
v4l2-subdev: change s_routing prototype
From: Hans Verkuil <hverkuil@xs4all.nl> 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. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/saa7191.c')
-rw-r--r--linux/drivers/media/video/saa7191.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/saa7191.c b/linux/drivers/media/video/saa7191.c
index f6a6b80b6..aa59776e1 100644
--- a/linux/drivers/media/video/saa7191.c
+++ b/linux/drivers/media/video/saa7191.c
@@ -166,14 +166,14 @@ static int saa7191_write_block(struct v4l2_subdev *sd,
/* Helper functions */
static int saa7191_s_routing(struct v4l2_subdev *sd,
- const struct v4l2_routing *route)
+ u32 input, u32 output, u32 config)
{
struct saa7191 *decoder = to_saa7191(sd);
u8 luma = saa7191_read_reg(sd, SAA7191_REG_LUMA);
u8 iock = saa7191_read_reg(sd, SAA7191_REG_IOCK);
int err;
- switch (route->input) {
+ switch (input) {
case SAA7191_INPUT_COMPOSITE: /* Set Composite input */
iock &= ~(SAA7191_IOCK_CHRS | SAA7191_IOCK_GPSW1
| SAA7191_IOCK_GPSW2);
@@ -196,7 +196,7 @@ static int saa7191_s_routing(struct v4l2_subdev *sd,
if (err)
return -EIO;
- decoder->input = route->input;
+ decoder->input = input;
return 0;
}