summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cs5345.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/cs5345.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/cs5345.c')
-rw-r--r--linux/drivers/media/video/cs5345.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/linux/drivers/media/video/cs5345.c b/linux/drivers/media/video/cs5345.c
index bc98ec17a..84e7cb967 100644
--- a/linux/drivers/media/video/cs5345.c
+++ b/linux/drivers/media/video/cs5345.c
@@ -59,14 +59,15 @@ static inline int cs5345_read(struct v4l2_subdev *sd, u8 reg)
return i2c_smbus_read_byte_data(client, reg);
}
-static int cs5345_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
+static int cs5345_s_routing(struct v4l2_subdev *sd,
+ u32 input, u32 output, u32 config)
{
- if ((route->input & 0xf) > 6) {
- v4l2_err(sd, "Invalid input %d.\n", route->input);
+ if ((input & 0xf) > 6) {
+ v4l2_err(sd, "Invalid input %d.\n", input);
return -EINVAL;
}
- cs5345_write(sd, 0x09, route->input & 0xf);
- cs5345_write(sd, 0x05, route->input & 0xf0);
+ cs5345_write(sd, 0x09, input & 0xf);
+ cs5345_write(sd, 0x05, input & 0xf0);
return 0;
}