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>

2 files changed, 2 insertions, 10 deletions

diff --git a/drivers/media/video/cx231xx/cx231xx-cards.c b/drivers/media/video/cx231xx/cx231xx-cards.c
index f209fe14f829..c8a32b1b5381 100644
--- a/drivers/media/video/cx231xx/cx231xx-cards.c
+++ b/drivers/media/video/cx231xx/cx231xx-cards.c
@@ -357,10 +357,7 @@ int cx231xx_config(struct cx231xx *dev)
  */
 void cx231xx_config_i2c(struct cx231xx *dev)
 {
-        struct v4l2_routing route;
-
-        route.input = INPUT(dev->video_input)->vmux;
-        route.output = 0;
+        /* u32 input = INPUT(dev->video_input)->vmux; */
 
         call_all(dev, video, s_stream, 1);
 }
diff --git a/drivers/media/video/cx231xx/cx231xx-video.c b/drivers/media/video/cx231xx/cx231xx-video.c
index 0645703e6f9c..a23ae73fe634 100644
--- a/drivers/media/video/cx231xx/cx231xx-video.c
+++ b/drivers/media/video/cx231xx/cx231xx-video.c
@@ -820,17 +820,12 @@ static struct videobuf_queue_ops cx231xx_video_qops = {
 
 void video_mux(struct cx231xx *dev, int index)
 {
-
-        struct v4l2_routing route;
-
-        route.input = INPUT(index)->vmux;
-        route.output = 0;
         dev->video_input = index;
         dev->ctl_ainput = INPUT(index)->amux;
 
         cx231xx_set_video_input_mux(dev, index);
 
-        cx25840_call(dev, video, s_routing, &route);
+        cx25840_call(dev, video, s_routing, INPUT(index)->vmux, 0, 0);
 
         cx231xx_set_audio_input(dev, dev->ctl_ainput);