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

diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c
index 8bb1fc17d195..5c24c993ac16 100644
--- a/drivers/media/video/saa7110.c
+++ b/drivers/media/video/saa7110.c
@@ -299,17 +299,18 @@ static int saa7110_s_std(struct v4l2_subdev *sd, v4l2_std_id std)
         return 0;
 }
 
-static int saa7110_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
+static int saa7110_s_routing(struct v4l2_subdev *sd,
+                             u32 input, u32 output, u32 config)
 {
         struct saa7110 *decoder = to_saa7110(sd);
 
-        if (route->input < 0 || route->input >= SAA7110_MAX_INPUT) {
-                v4l2_dbg(1, debug, sd, "input=%d not available\n", route->input);
+        if (input < 0 || input >= SAA7110_MAX_INPUT) {
+                v4l2_dbg(1, debug, sd, "input=%d not available\n", input);
                 return -EINVAL;
         }
-        if (decoder->input != route->input) {
-                saa7110_selmux(sd, route->input);
-                v4l2_dbg(1, debug, sd, "switched to input=%d\n", route->input);
+        if (decoder->input != input) {
+                saa7110_selmux(sd, input);
+                v4l2_dbg(1, debug, sd, "switched to input=%d\n", input);
         }
         return 0;
 }