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>

1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/media/video/upd64031a.c b/drivers/media/video/upd64031a.c
index c0ac651bb35..a07a3fbb51e 100644
--- a/drivers/media/video/upd64031a.c
+++ b/drivers/media/video/upd64031a.c
@@ -124,17 +124,18 @@ static int upd64031a_s_frequency(struct v4l2_subdev *sd, struct v4l2_frequency *
 
 /* ------------------------------------------------------------------------ */
 
-static int upd64031a_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
+static int upd64031a_s_routing(struct v4l2_subdev *sd,
+                               u32 input, u32 output, u32 config)
 {
         struct upd64031a_state *state = to_state(sd);
         u8 r00, r05, r08;
 
-        state->gr_mode = (route->input & 3) << 6;
-        state->direct_3dycs_connect = (route->input & 0xc) << 4;
+        state->gr_mode = (input & 3) << 6;
+        state->direct_3dycs_connect = (input & 0xc) << 4;
         state->ext_comp_sync =
-                (route->input & UPD64031A_COMPOSITE_EXTERNAL) << 1;
+                (input & UPD64031A_COMPOSITE_EXTERNAL) << 1;
         state->ext_vert_sync =
-                (route->input & UPD64031A_VERTICAL_EXTERNAL) << 2;
+                (input & UPD64031A_VERTICAL_EXTERNAL) << 2;
         r00 = (state->regs[R00] & ~GR_MODE_MASK) | state->gr_mode;
         r05 = (state->regs[R00] & ~SYNC_CIRCUIT_MASK) |
                 state->ext_comp_sync | state->ext_vert_sync;