From: Mike Isely <isely@pobox.com>
Date: Tue, 22 Apr 2008 17:45:41 +0000 (-0300)
Subject: V4L/DVB (7310): pvrusb2: trace print cosmetic cleanup / improvements
X-Git-Tag: v2.6.26-rc1~1084^2~356
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9db1ff23507d3e430db2bd130bd7861baa8c87e;p=linux-2.6

V4L/DVB (7310): pvrusb2: trace print cosmetic cleanup / improvements

Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---

diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 0941f0b434..85e61d4b64 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -2394,6 +2394,7 @@ static int pvr2_hdw_commit_execute(struct pvr2_hdw *hdw)
 	     hdw->pathway_state)) {
 		/* Change of mode being asked for... */
 		hdw->state_pathway_ok = 0;
+		trace_stbit("state_pathway_ok",hdw->state_pathway_ok);
 	}
 	if (!hdw->state_pathway_ok) {
 		/* Can't commit anything until pathway is ok. */
@@ -3392,6 +3393,7 @@ static int state_eval_pathway_ok(struct pvr2_hdw *hdw)
 	}
 	pvr2_hdw_cmd_modeswitch(hdw,hdw->input_val == PVR2_CVAL_INPUT_DTV);
 	hdw->state_pathway_ok = !0;
+	trace_stbit("state_pathway_ok",hdw->state_pathway_ok);
 	return !0;
 }
 
@@ -3720,7 +3722,7 @@ static unsigned int pvr2_hdw_report_unlocked(struct pvr2_hdw *hdw,int which,
 	case 0:
 		return scnprintf(
 			buf,acnt,
-			"driver:%s%s%s%s%s<mode=%s>",
+			"driver:%s%s%s%s%s <mode=%s>",
 			(hdw->flag_ok ? " <ok>" : " <fail>"),
 			(hdw->flag_init_ok ? " <init>" : " <uninitialized>"),
 			(hdw->flag_disconnected ? " <disconnected>" :
@@ -3759,7 +3761,7 @@ static unsigned int pvr2_hdw_report_unlocked(struct pvr2_hdw *hdw,int which,
 			(hdw->state_usbstream_run ?
 			 " <usb:run>" : " <usb:stop>"),
 			(hdw->state_pathway_ok ?
-			 "<pathway:ok>" : ""));
+			 " <pathway:ok>" : ""));
 		break;
 	case 3:
 		return scnprintf(