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/cs53l32a.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/cs53l32a.c')
-rw-r--r-- | drivers/media/video/cs53l32a.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/media/video/cs53l32a.c b/drivers/media/video/cs53l32a.c index 5aeb066857a7..80bca8df9fbf 100644 --- a/drivers/media/video/cs53l32a.c +++ b/drivers/media/video/cs53l32a.c | |||
@@ -58,17 +58,18 @@ static int cs53l32a_read(struct v4l2_subdev *sd, u8 reg) | |||
58 | return i2c_smbus_read_byte_data(client, reg); | 58 | return i2c_smbus_read_byte_data(client, reg); |
59 | } | 59 | } |
60 | 60 | ||
61 | static int cs53l32a_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route) | 61 | static int cs53l32a_s_routing(struct v4l2_subdev *sd, |
62 | u32 input, u32 output, u32 config) | ||
62 | { | 63 | { |
63 | /* There are 2 physical inputs, but the second input can be | 64 | /* There are 2 physical inputs, but the second input can be |
64 | placed in two modes, the first mode bypasses the PGA (gain), | 65 | placed in two modes, the first mode bypasses the PGA (gain), |
65 | the second goes through the PGA. Hence there are three | 66 | the second goes through the PGA. Hence there are three |
66 | possible inputs to choose from. */ | 67 | possible inputs to choose from. */ |
67 | if (route->input > 2) { | 68 | if (input > 2) { |
68 | v4l2_err(sd, "Invalid input %d.\n", route->input); | 69 | v4l2_err(sd, "Invalid input %d.\n", input); |
69 | return -EINVAL; | 70 | return -EINVAL; |
70 | } | 71 | } |
71 | cs53l32a_write(sd, 0x01, 0x01 + (route->input << 4)); | 72 | cs53l32a_write(sd, 0x01, 0x01 + (input << 4)); |
72 | return 0; | 73 | return 0; |
73 | } | 74 | } |
74 | 75 | ||