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>

5 files changed, 12 insertions, 27 deletions

diff --git a/drivers/media/video/cx18/cx18-audio.c b/drivers/media/video/cx18/cx18-audio.c
index bb5c5165dd5f..1519e91c677a 100644
--- a/drivers/media/video/cx18/cx18-audio.c
+++ b/drivers/media/video/cx18/cx18-audio.c
@@ -33,7 +33,6 @@
 int cx18_audio_set_io(struct cx18 *cx)
 {
         const struct cx18_card_audio_input *in;
-        struct v4l2_routing route;
         u32 val;
         int err;
 
@@ -44,13 +43,11 @@ int cx18_audio_set_io(struct cx18 *cx)
                 in = &cx->card->audio_inputs[cx->audio_input];
 
         /* handle muxer chips */
-        route.input = in->muxer_input;
-        route.output = 0;
-        v4l2_subdev_call(cx->sd_extmux, audio, s_routing, &route);
+        v4l2_subdev_call(cx->sd_extmux, audio, s_routing,
+                        in->audio_input, 0, 0);
 
-        route.input = in->audio_input;
         err = cx18_call_hw_err(cx, cx->card->hw_audio_ctrl,
-                               audio, s_routing, &route);
+                               audio, s_routing, in->audio_input, 0, 0);
         if (err)
                 return err;
 
diff --git a/drivers/media/video/cx18/cx18-av-core.c b/drivers/media/video/cx18/cx18-av-core.c
index 9b3e574dd829..cf2bd888a429 100644
--- a/drivers/media/video/cx18/cx18-av-core.c
+++ b/drivers/media/video/cx18/cx18-av-core.c
@@ -547,19 +547,19 @@ static int set_input(struct cx18 *cx, enum cx18_av_video_input vid_input,
 }
 
 static int cx18_av_s_video_routing(struct v4l2_subdev *sd,
-                                   const struct v4l2_routing *route)
+                                   u32 input, u32 output, u32 config)
 {
         struct cx18_av_state *state = to_cx18_av_state(sd);
         struct cx18 *cx = v4l2_get_subdevdata(sd);
-        return set_input(cx, route->input, state->aud_input);
+        return set_input(cx, input, state->aud_input);
 }
 
 static int cx18_av_s_audio_routing(struct v4l2_subdev *sd,
-                                   const struct v4l2_routing *route)
+                                   u32 input, u32 output, u32 config)
 {
         struct cx18_av_state *state = to_cx18_av_state(sd);
         struct cx18 *cx = v4l2_get_subdevdata(sd);
-        return set_input(cx, state->vid_input, route->input);
+        return set_input(cx, state->vid_input, input);
 }
 
 static int cx18_av_g_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *vt)
diff --git a/drivers/media/video/cx18/cx18-gpio.c b/drivers/media/video/cx18/cx18-gpio.c
index ae2460e6860a..86a204b5448e 100644
--- a/drivers/media/video/cx18/cx18-gpio.c
+++ b/drivers/media/video/cx18/cx18-gpio.c
@@ -156,12 +156,12 @@ static int gpiomux_s_std(struct v4l2_subdev *sd, v4l2_std_id norm)
 }
 
 static int gpiomux_s_audio_routing(struct v4l2_subdev *sd,
-                                   const struct v4l2_routing *route)
+                                   u32 input, u32 output, u32 config)
 {
         struct cx18 *cx = v4l2_get_subdevdata(sd);
         u32 data;
 
-        switch (route->input) {
+        switch (input) {
         case 0:
                 data = cx->card->gpio_audio_input.tuner;
                 break;
diff --git a/drivers/media/video/cx18/cx18-ioctl.c b/drivers/media/video/cx18/cx18-ioctl.c
index f572080590fb..cdefd90d5eca 100644
--- a/drivers/media/video/cx18/cx18-ioctl.c
+++ b/drivers/media/video/cx18/cx18-ioctl.c
@@ -932,7 +932,7 @@ static long cx18_default(struct file *file, void *fh, int cmd, void *arg)
                 CX18_DEBUG_IOCTL("VIDIOC_INT_S_AUDIO_ROUTING(%d, %d)\n",
                         route->input, route->output);
                 cx18_call_hw(cx, cx->card->hw_audio_ctrl, audio, s_routing,
-                             route);
+                             route->input, route->output, 0);
                 break;
         }
 
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);
 }