[svn-commits] sruffell: linux/trunk r10232 - /linux/trunk/drivers/dahdi/wct4xxp/base.c

[SVN commits to the Digium repositories]

Author: sruffell
Date: Thu Oct 20 15:52:10 2011
New Revision: 10232

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10232
Log:
wct4xxp: Remove some debug information from the kernel logs.

Also has the nice side effect of eliminating a comparison from the
interrupt handler.

Signed-off-by: Shaun Ruffell <sruffell at digium.com>
Acked-by: Michael Spiceland <mspiceland at digium.com>
Acked-by: Russ Meyerriecks <rmeyerriecks at digium.com>

Modified:
    linux/trunk/drivers/dahdi/wct4xxp/base.c

Modified: linux/trunk/drivers/dahdi/wct4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wct4xxp/base.c?view=diff&rev=10232&r1=10231&r2=10232
==============================================================================
--- linux/trunk/drivers/dahdi/wct4xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wct4xxp/base.c Thu Oct 20 15:52:10 2011
@@ -3942,10 +3942,11 @@
 		wc->rxident = rxident;
 	}
 
+#ifdef DEBUG
 	if (unlikely((wc->intcount < 20)))
-
-		dev_info(&wc->dev->dev, "2G: Got interrupt, status = %08x, "
+		dev_dbg(&wc->dev->dev, "2G: Got interrupt, status = %08x, "
 			"CIS = %04x\n", status, t4_framer_in(wc, 0, FRMR_CIS));
+#endif
 
 	if (likely(status & 0x2)) {
 #ifdef ENABLE_WORKQUEUES
@@ -3970,12 +3971,11 @@
 				atomic_dec(&wc->worklist);
 		}
 #else
-#if 1
 		unsigned int reg5 = __t4_pci_in(wc, 5);
-		if (wc->intcount < 20) {
-
+
+#ifdef DEBUG
+		if (wc->intcount < 20)
 			dev_info(&wc->dev->dev, "Reg 5 is %08x\n", reg5);
-		}
 #endif
 
 		if (wc->flags & FLAG_5THGEN) {
@@ -4493,11 +4493,13 @@
 
 	version = t4_pci_in(wc, WC_VERSION);
 	dev_info(&wc->dev->dev, "Firmware Version: %08x\n", version);
-	dev_info(&wc->dev->dev, "Burst Mode: %s\n",
-		(!(cardflags & FLAG_BURST) && noburst) ? "Off" : "On");
+	if (debug) {
+		dev_info(&wc->dev->dev, "Burst Mode: %s\n",
+			(!(cardflags & FLAG_BURST) && noburst) ? "Off" : "On");
 #ifdef ENABLE_WORKQUEUES
-	dev_info(&wc->dev->dev, "Work Queues: Enabled\n");
-#endif
+		dev_info(&wc->dev->dev, "Work Queues: Enabled\n");
+#endif
+	}
 
 #if defined(CONFIG_FORCE_EXTENDED_RESET)
 	t4_extended_reset(wc);
@@ -4574,11 +4576,13 @@
 	t4_framer_out(wc, 0, 0xd6, regval);
 	
 	t4_framer_out(wc, 0, 0x4a, 0xaa);
-	dev_info(&wc->dev->dev, "Board ID: %02x\n", wc->order);
-
-	for (x=0;x< 11;x++)
-		dev_info(&wc->dev->dev, "Reg %d: 0x%08x\n", x,
-				t4_pci_in(wc, x));
+	if (debug) {
+		dev_info(&wc->dev->dev, "Board ID: %02x\n", wc->order);
+		for (x = 0; x < 11; x++) {
+			dev_info(&wc->dev->dev, "Reg %d: 0x%08x\n", x,
+					t4_pci_in(wc, x));
+		}
+	}
 	return 0;
 }
 
@@ -4588,8 +4592,12 @@
 	unsigned long flags;
 	if (test_bit(DAHDI_FLAGBIT_REGISTERED, &wc->tspans[0]->span.flags))
 		return 0;
-	dev_info(&wc->dev->dev, "TE%dXXP: Launching card: %d\n", wc->numspans,
-			wc->order);
+
+	if (debug) {
+		dev_info(&wc->dev->dev,
+			 "TE%dXXP: Launching card: %d\n", wc->numspans,
+			 wc->order);
+	}
 
 	/* Setup serial parameters and system interface */
 	for (x=0;x<PORTS_PER_FRAMER;x++)
@@ -4723,8 +4731,8 @@
 		dev_info(&pdev->dev, "wct%dxxp: Unable to request regions\n",
 				wc->numspans);
 	
-	dev_info(&pdev->dev, "Found TE%dXXP at base address %08lx, remapped "
-			"to %p\n", wc->numspans, wc->memaddr, wc->membase);
+	if (debug)
+		dev_info(&pdev->dev, "Found TE%dXXP\n", wc->numspans);
 	
 	wc->dev = pdev;