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, 5 insertions, 5 deletions

diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c
index 052fbe9cde86..cf48b6ab97cb 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;
         }