Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90135c96 authored by Mike Isely's avatar Mike Isely Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (12122): pvrusb2: De-obfuscate code which handles routing schemes 



This change does not change any outward behavior; it merely chops down
some large if-conditions with embedded assignments into something a
little more maintainable for others (I of course never had a problem
with this...).

Signed-off-by: default avatarMike Isely <isely@pobox.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 81e804c9

drivers/media/video/pvrusb2/pvrusb2-cs53l32a.c

+6 −6
Original line number Diff line number Diff line
@@ -67,12 +67,11 @@ void pvr2_cs53l32a_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd) 
		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)) {

			input = sp->def[hdw->input_val];

		} else {

		sp = (sid < ARRAY_SIZE(routing_schemes)) ?

			routing_schemes[sid] : NULL;

		if ((sp == NULL) ||

		    (hdw->input_val < 0) ||

		    (hdw->input_val >= sp->cnt)) {

			pvr2_trace(PVR2_TRACE_ERROR_LEGS,

				   "*** WARNING *** subdev v4l2 set_input:"

				   " Invalid routing scheme (%u)"
@@ -80,6 +79,7 @@ void pvr2_cs53l32a_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd) 
				   sid, hdw->input_val);

			return;

		}

		input = sp->def[hdw->input_val];

		sd->ops->audio->s_routing(sd, input, 0, 0);

	}

}

drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c

+7 −8
Original line number Diff line number Diff line
@@ -114,13 +114,11 @@ void pvr2_cx25840_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd) 
		const struct routing_scheme *sp;

		unsigned int sid = hdw->hdw_desc->signal_routing_scheme;



		if ((sid < ARRAY_SIZE(routing_schemes)) &&

		    ((sp = routing_schemes[sid]) != NULL) &&

		    (hdw->input_val >= 0) &&

		    (hdw->input_val < sp->cnt)) {

			vid_input = sp->def[hdw->input_val].vid;

			aud_input = sp->def[hdw->input_val].aud;

		} else {

		sp = (sid < ARRAY_SIZE(routing_schemes)) ?

			routing_schemes[sid] : NULL;

		if ((sp == NULL) ||

		    (hdw->input_val < 0) ||

		    (hdw->input_val >= sp->cnt)) {

			pvr2_trace(PVR2_TRACE_ERROR_LEGS,

				   "*** WARNING *** subdev cx2584x set_input:"

				   " Invalid routing scheme (%u)"
@@ -128,7 +126,8 @@ void pvr2_cx25840_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd) 
				   sid, hdw->input_val);

			return;

		}



		vid_input = sp->def[hdw->input_val].vid;

		aud_input = sp->def[hdw->input_val].aud;

		pvr2_trace(PVR2_TRACE_CHIPS,

			   "subdev cx2584x set_input vid=0x%x aud=0x%x",

			   vid_input, aud_input);

drivers/media/video/pvrusb2/pvrusb2-video-v4l.c

+7 −6
Original line number Diff line number Diff line
@@ -85,12 +85,12 @@ void pvr2_saa7115_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd) 


		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)) {

			input = sp->def[hdw->input_val];

		} else {



		sp = (sid < ARRAY_SIZE(routing_schemes)) ?

			routing_schemes[sid] : NULL;

		if ((sp == NULL) ||

		    (hdw->input_val < 0) ||

		    (hdw->input_val >= sp->cnt)) {

			pvr2_trace(PVR2_TRACE_ERROR_LEGS,

				   "*** WARNING *** subdev v4l2 set_input:"

				   " Invalid routing scheme (%u)"
@@ -98,6 +98,7 @@ void pvr2_saa7115_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd) 
				   sid, hdw->input_val);

			return;

		}

		input = sp->def[hdw->input_val];

		sd->ops->video->s_routing(sd, input, 0, 0);

	}

}