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, 2 insertions, 14 deletions

diff --git a/drivers/media/video/cx18/cx18-video.c b/drivers/media/video/cx18/cx18-video.c
index 6fdadedf17a8..6dc84aac8f44 100644
--- a/drivers/media/video/cx18/cx18-video.c
+++ b/drivers/media/video/cx18/cx18-video.c
@@ -25,20 +25,8 @@
 
 void cx18_video_set_io(struct cx18 *cx)
 {
-        struct v4l2_routing route;
         int inp = cx->active_input;
-        u32 type;
 
-        route.input = cx->card->video_inputs[inp].video_input;
-        route.output = 0;
-        v4l2_subdev_call(cx->sd_av, video, s_routing, &route);
-
-        type = cx->card->video_inputs[inp].video_type;
-
-        if (type == CX18_CARD_INPUT_VID_TUNER)
-                route.input = 0;  /* Tuner */
-        else if (type < CX18_CARD_INPUT_COMPOSITE1)
-                route.input = 2;  /* S-Video */
-        else
-                route.input = 1;  /* Composite */
+        v4l2_subdev_call(cx->sd_av, video, s_routing,
+                        cx->card->video_inputs[inp].video_input, 0, 0);
 }