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>

3 files changed, 49 insertions, 43 deletions

diff --git a/drivers/media/video/ivtv/ivtv-gpio.c b/drivers/media/video/ivtv/ivtv-gpio.c
index 0dd5f53b731..ceb05bdcaf6 100644
--- a/drivers/media/video/ivtv/ivtv-gpio.c
+++ b/drivers/media/video/ivtv/ivtv-gpio.c
@@ -248,15 +248,16 @@ static int subdev_s_std(struct v4l2_subdev *sd, v4l2_std_id std)
         return 0;
 }
 
-static int subdev_s_audio_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
+static int subdev_s_audio_routing(struct v4l2_subdev *sd,
+                                  u32 input, u32 output, u32 config)
 {
         struct ivtv *itv = sd_to_ivtv(sd);
         u16 mask, data;
 
-        if (route->input > 2)
+        if (input > 2)
                 return -EINVAL;
         mask = itv->card->gpio_audio_input.mask;
-        switch (route->input) {
+        switch (input) {
         case 0:
                 data = itv->card->gpio_audio_input.tuner;
                 break;
@@ -318,17 +319,18 @@ static int subdev_log_status(struct v4l2_subdev *sd)
         return 0;
 }
 
-static int subdev_s_video_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
+static int subdev_s_video_routing(struct v4l2_subdev *sd,
+                                  u32 input, u32 output, u32 config)
 {
         struct ivtv *itv = sd_to_ivtv(sd);
         u16 mask, data;
 
-        if (route->input > 2) /* 0:Tuner 1:Composite 2:S-Video */
+        if (input > 2) /* 0:Tuner 1:Composite 2:S-Video */
                 return -EINVAL;
         mask = itv->card->gpio_video_input.mask;
-        if  (route->input == 0)
+        if (input == 0)
                 data = itv->card->gpio_video_input.tuner;
-        else if  (route->input == 1)
+        else if (input == 1)
                 data = itv->card->gpio_video_input.composite;
         else
                 data = itv->card->gpio_video_input.svideo;
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c
index 052fbe9cde8..cf48b6ab97c 100644
--- a/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -1033,7 +1033,6 @@ static int ivtv_g_output(struct file *file, void *fh, unsigned int *i)
 static int ivtv_s_output(struct file *file, void *fh, unsigned int outp)
 {
         struct ivtv *itv = ((struct ivtv_open_id *)fh)->itv;
-        struct v4l2_routing route;
 
         if (outp >= itv->card->nof_outputs)
                 return -EINVAL;
@@ -1046,9 +1045,9 @@ static int ivtv_s_output(struct file *file, void *fh, unsigned int outp)
                    itv->active_output, outp);
 
         itv->active_output = outp;
-        route.input = SAA7127_INPUT_TYPE_NORMAL;
-        route.output = itv->card->video_outputs[outp].video_output;
-        ivtv_call_hw(itv, IVTV_HW_SAA7127, video, s_routing, &route);
+        ivtv_call_hw(itv, IVTV_HW_SAA7127, video, s_routing,
+                        SAA7127_INPUT_TYPE_NORMAL,
+                        itv->card->video_outputs[outp].video_output, 0);
 
         return 0;
 }
@@ -1738,7 +1737,8 @@ static long ivtv_default(struct file *file, void *fh, int cmd, void *arg)
         case VIDIOC_INT_S_AUDIO_ROUTING: {
                 struct v4l2_routing *route = arg;
 
-                ivtv_call_hw(itv, itv->card->hw_audio, audio, s_routing, route);
+                ivtv_call_hw(itv, itv->card->hw_audio, audio, s_routing,
+                                route->input, route->output, 0);
                 break;
         }
 
diff --git a/drivers/media/video/ivtv/ivtv-routing.c b/drivers/media/video/ivtv/ivtv-routing.c
index 3fd30229449..8898c569a1c 100644
--- a/drivers/media/video/ivtv/ivtv-routing.c
+++ b/drivers/media/video/ivtv/ivtv-routing.c
@@ -34,7 +34,7 @@
 void ivtv_audio_set_io(struct ivtv *itv)
 {
         const struct ivtv_card_audio_input *in;
-        struct v4l2_routing route;
+        u32 input, output = 0;
 
         /* Determine which input to use */
         if (test_bit(IVTV_F_I_RADIO_USER, &itv->i_flags))
@@ -43,73 +43,77 @@ void ivtv_audio_set_io(struct ivtv *itv)
                 in = &itv->card->audio_inputs[itv->audio_input];
 
         /* handle muxer chips */
-        route.input = in->muxer_input;
-        route.output = 0;
+        input = in->muxer_input;
         if (itv->card->hw_muxer & IVTV_HW_M52790)
-                route.output = M52790_OUT_STEREO;
-        v4l2_subdev_call(itv->sd_muxer, audio, s_routing, &route);
+                output = M52790_OUT_STEREO;
+        v4l2_subdev_call(itv->sd_muxer, audio, s_routing,
+                        input, output, 0);
 
-        route.input = in->audio_input;
-        route.output = 0;
+        input = in->audio_input;
+        output = 0;
         if (itv->card->hw_audio & IVTV_HW_MSP34XX)
-                route.output = MSP_OUTPUT(MSP_SC_IN_DSP_SCART1);
-        ivtv_call_hw(itv, itv->card->hw_audio, audio, s_routing, &route);
+                output = MSP_OUTPUT(MSP_SC_IN_DSP_SCART1);
+        ivtv_call_hw(itv, itv->card->hw_audio, audio, s_routing,
+                        input, output, 0);
 }
 
 /* Selects the video input and output according to the current
    settings. */
 void ivtv_video_set_io(struct ivtv *itv)
 {
-        struct v4l2_routing route;
         int inp = itv->active_input;
+        u32 input;
         u32 type;
 
-        route.input = itv->card->video_inputs[inp].video_input;
-        route.output = 0;
-        v4l2_subdev_call(itv->sd_video, video, s_routing, &route);
+        v4l2_subdev_call(itv->sd_video, video, s_routing,
+                itv->card->video_inputs[inp].video_input, 0, 0);
 
         type = itv->card->video_inputs[inp].video_type;
 
         if (type == IVTV_CARD_INPUT_VID_TUNER) {
-                route.input = 0;  /* Tuner */
+                input = 0;  /* Tuner */
         } else if (type < IVTV_CARD_INPUT_COMPOSITE1) {
-                route.input = 2;  /* S-Video */
+                input = 2;  /* S-Video */
         } else {
-                route.input = 1;  /* Composite */
+                input = 1;  /* Composite */
         }
 
         if (itv->card->hw_video & IVTV_HW_GPIO)
-                ivtv_call_hw(itv, IVTV_HW_GPIO, video, s_routing, &route);
+                ivtv_call_hw(itv, IVTV_HW_GPIO, video, s_routing,
+                                input, 0, 0);
 
         if (itv->card->hw_video & IVTV_HW_UPD64031A) {
                 if (type == IVTV_CARD_INPUT_VID_TUNER ||
                     type >= IVTV_CARD_INPUT_COMPOSITE1) {
                         /* Composite: GR on, connect to 3DYCS */
-                        route.input = UPD64031A_GR_ON | UPD64031A_3DYCS_COMPOSITE;
+                        input = UPD64031A_GR_ON | UPD64031A_3DYCS_COMPOSITE;
                 } else {
                         /* S-Video: GR bypassed, turn it off */
-                        route.input = UPD64031A_GR_OFF | UPD64031A_3DYCS_DISABLE;
+                        input = UPD64031A_GR_OFF | UPD64031A_3DYCS_DISABLE;
                 }
-                route.input |= itv->card->gr_config;
+                input |= itv->card->gr_config;
 
-                ivtv_call_hw(itv, IVTV_HW_UPD64031A, video, s_routing, &route);
+                ivtv_call_hw(itv, IVTV_HW_UPD64031A, video, s_routing,
+                                input, 0, 0);
         }
 
         if (itv->card->hw_video & IVTV_HW_UPD6408X) {
-                route.input = UPD64083_YCS_MODE;
+                input = UPD64083_YCS_MODE;
                 if (type > IVTV_CARD_INPUT_VID_TUNER &&
                     type < IVTV_CARD_INPUT_COMPOSITE1) {
-                        /* S-Video uses YCNR mode and internal Y-ADC, the upd64031a
-                           is not used. */
-                        route.input |= UPD64083_YCNR_MODE;
+                        /* S-Video uses YCNR mode and internal Y-ADC, the
+                           upd64031a is not used. */
+                        input |= UPD64083_YCNR_MODE;
                 }
                 else if (itv->card->hw_video & IVTV_HW_UPD64031A) {
-                  /* Use upd64031a output for tuner and composite(CX23416GYC only) inputs */
-                  if ((type == IVTV_CARD_INPUT_VID_TUNER)||
-                      (itv->card->type == IVTV_CARD_CX23416GYC)) {
-                    route.input |= UPD64083_EXT_Y_ADC;
-                  }
+                        /* Use upd64031a output for tuner and
+                           composite(CX23416GYC only) inputs */
+                        if (type == IVTV_CARD_INPUT_VID_TUNER ||
+                            itv->card->type == IVTV_CARD_CX23416GYC) {
+                                input |= UPD64083_EXT_Y_ADC;
+                        }
                 }
-                ivtv_call_hw(itv, IVTV_HW_UPD6408X, video, s_routing, &route);
+                ivtv_call_hw(itv, IVTV_HW_UPD6408X, video, s_routing,
+                                input, 0, 0);
         }
 }