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/cs5345.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/cs5345.c')
-rw-r--r-- | drivers/media/video/cs5345.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/media/video/cs5345.c b/drivers/media/video/cs5345.c index 9714059ee949..57dc1704b6c0 100644 --- a/drivers/media/video/cs5345.c +++ b/drivers/media/video/cs5345.c | |||
@@ -53,14 +53,15 @@ static inline int cs5345_read(struct v4l2_subdev *sd, u8 reg) | |||
53 | return i2c_smbus_read_byte_data(client, reg); | 53 | return i2c_smbus_read_byte_data(client, reg); |
54 | } | 54 | } |
55 | 55 | ||
56 | static int cs5345_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route) | 56 | static int cs5345_s_routing(struct v4l2_subdev *sd, |
57 | u32 input, u32 output, u32 config) | ||
57 | { | 58 | { |
58 | if ((route->input & 0xf) > 6) { | 59 | if ((input & 0xf) > 6) { |
59 | v4l2_err(sd, "Invalid input %d.\n", route->input); | 60 | v4l2_err(sd, "Invalid input %d.\n", input); |
60 | return -EINVAL; | 61 | return -EINVAL; |
61 | } | 62 | } |
62 | cs5345_write(sd, 0x09, route->input & 0xf); | 63 | cs5345_write(sd, 0x09, input & 0xf); |
63 | cs5345_write(sd, 0x05, route->input & 0xf0); | 64 | cs5345_write(sd, 0x05, input & 0xf0); |
64 | return 0; | 65 | return 0; |
65 | } | 66 | } |
66 | 67 | ||