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, 18 insertions, 26 deletions

diff --git a/drivers/media/video/pvrusb2/pvrusb2-audio.c b/drivers/media/video/pvrusb2/pvrusb2-audio.c
index ccf2a3c7ad0..10ef1a2c13e 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-audio.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-audio.c
@@ -58,9 +58,9 @@ static const struct routing_scheme routing_schemes[] = {
 void pvr2_msp3400_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
 {
         if (hdw->input_dirty || hdw->force_dirty) {
-                struct v4l2_routing route;
                 const struct routing_scheme *sp;
                 unsigned int sid = hdw->hdw_desc->signal_routing_scheme;
+                u32 input;
 
                 pvr2_trace(PVR2_TRACE_CHIPS, "subdev msp3400 v4l2 set_stereo");
 
@@ -68,7 +68,7 @@ void pvr2_msp3400_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
                     ((sp = routing_schemes + sid) != NULL) &&
                     (hdw->input_val >= 0) &&
                     (hdw->input_val < sp->cnt)) {
-                        route.input = sp->def[hdw->input_val];
+                        input = sp->def[hdw->input_val];
                 } else {
                         pvr2_trace(PVR2_TRACE_ERROR_LEGS,
                                    "*** WARNING *** subdev msp3400 set_input:"
@@ -77,8 +77,8 @@ void pvr2_msp3400_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
                                    sid, hdw->input_val);
                         return;
                 }
-                route.output = MSP_OUTPUT(MSP_SC_IN_DSP_SCART1);
-                sd->ops->audio->s_routing(sd, &route);
+                sd->ops->audio->s_routing(sd, input,
+                        MSP_OUTPUT(MSP_SC_IN_DSP_SCART1), 0);
         }
 }
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-cs53l32a.c b/drivers/media/video/pvrusb2/pvrusb2-cs53l32a.c
index b5c3428ebb9..9023adf3fdc 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-cs53l32a.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-cs53l32a.c
@@ -60,16 +60,16 @@ static const struct routing_scheme routing_schemes[] = {
 void pvr2_cs53l32a_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
 {
         if (hdw->input_dirty || hdw->force_dirty) {
-                struct v4l2_routing route;
                 const struct routing_scheme *sp;
                 unsigned int sid = hdw->hdw_desc->signal_routing_scheme;
+                u32 input;
                 pvr2_trace(PVR2_TRACE_CHIPS, "subdev v4l2 set_input(%d)",
                            hdw->input_val);
                 if ((sid < ARRAY_SIZE(routing_schemes)) &&
                     ((sp = routing_schemes + sid) != NULL) &&
                     (hdw->input_val >= 0) &&
                     (hdw->input_val < sp->cnt)) {
-                        route.input = sp->def[hdw->input_val];
+                        input = sp->def[hdw->input_val];
                 } else {
                         pvr2_trace(PVR2_TRACE_ERROR_LEGS,
                                    "*** WARNING *** subdev v4l2 set_input:"
@@ -78,8 +78,7 @@ void pvr2_cs53l32a_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
                                    sid, hdw->input_val);
                         return;
                 }
-                route.output = 0;
-                sd->ops->audio->s_routing(sd, &route);
+                sd->ops->audio->s_routing(sd, input, 0, 0);
         }
 }
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
index 4e017ff26c3..05e52358ae4 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
@@ -105,14 +105,11 @@ void pvr2_cx25840_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
 {
         pvr2_trace(PVR2_TRACE_CHIPS, "subdev cx2584x update...");
         if (hdw->input_dirty || hdw->force_dirty) {
-                struct v4l2_routing route;
                 enum cx25840_video_input vid_input;
                 enum cx25840_audio_input aud_input;
                 const struct routing_scheme *sp;
                 unsigned int sid = hdw->hdw_desc->signal_routing_scheme;
 
-                memset(&route, 0, sizeof(route));
-
                 if ((sid < ARRAY_SIZE(routing_schemes)) &&
                     ((sp = routing_schemes + sid) != NULL) &&
                     (hdw->input_val >= 0) &&
@@ -131,10 +128,8 @@ void pvr2_cx25840_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
                 pvr2_trace(PVR2_TRACE_CHIPS,
                            "subdev cx2584x set_input vid=0x%x aud=0x%x",
                            vid_input, aud_input);
-                route.input = (u32)vid_input;
-                sd->ops->video->s_routing(sd, &route);
-                route.input = (u32)aud_input;
-                sd->ops->audio->s_routing(sd, &route);
+                sd->ops->video->s_routing(sd, (u32)vid_input, 0, 0);
+                sd->ops->audio->s_routing(sd, (u32)aud_input, 0, 0);
         }
 }
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c b/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
index b3862f5554b..d2fe7c8f2c3 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
@@ -75,16 +75,17 @@ static const struct routing_scheme routing_schemes[] = {
 void pvr2_saa7115_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
 {
         if (hdw->input_dirty || hdw->force_dirty) {
-                struct v4l2_routing route;
                 const struct routing_scheme *sp;
                 unsigned int sid = hdw->hdw_desc->signal_routing_scheme;
+                u32 input;
+
                 pvr2_trace(PVR2_TRACE_CHIPS, "subdev v4l2 set_input(%d)",
                            hdw->input_val);
                 if ((sid < ARRAY_SIZE(routing_schemes)) &&
                     ((sp = routing_schemes + sid) != NULL) &&
                     (hdw->input_val >= 0) &&
                     (hdw->input_val < sp->cnt)) {
-                        route.input = sp->def[hdw->input_val];
+                        input = sp->def[hdw->input_val];
                 } else {
                         pvr2_trace(PVR2_TRACE_ERROR_LEGS,
                                    "*** WARNING *** subdev v4l2 set_input:"
@@ -93,8 +94,7 @@ void pvr2_saa7115_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
                                    sid, hdw->input_val);
                         return;
                 }
-                route.output = 0;
-                sd->ops->video->s_routing(sd, &route);
+                sd->ops->video->s_routing(sd, input, 0, 0);
         }
 }
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-wm8775.c b/drivers/media/video/pvrusb2/pvrusb2-wm8775.c
index 1670aa4051c..8c1eae05aa0 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-wm8775.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-wm8775.c
@@ -39,24 +39,22 @@
 void pvr2_wm8775_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
 {
         if (hdw->input_dirty || hdw->force_dirty) {
-                struct v4l2_routing route;
-
-                memset(&route, 0, sizeof(route));
+                u32 input;
 
                 switch (hdw->input_val) {
                 case PVR2_CVAL_INPUT_RADIO:
-                        route.input = 1;
+                        input = 1;
                         break;
                 default:
                         /* All other cases just use the second input */
-                        route.input = 2;
+                        input = 2;
                         break;
                 }
                 pvr2_trace(PVR2_TRACE_CHIPS, "subdev wm8775"
                            " set_input(val=%d route=0x%x)",
-                           hdw->input_val, route.input);
+                           hdw->input_val, input);
 
-                sd->ops->audio->s_routing(sd, &route);
+                sd->ops->audio->s_routing(sd, input, 0, 0);
         }
 }