Change all instances of printk in DAHDI to include a priority

(closes issue #11504)
Reported by: tzafrir
Patches:
      20080717__issue11504_dahdi_printk_without_priority.diff uploaded by bbryant (license 36)


git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4685 a0bf4364-ded3-4de4-8d8a-66a801d63aff

1 files changed, 39 insertions, 39 deletions

diff --git a/drivers/dahdi/tor2.c b/drivers/dahdi/tor2.c
index 6f0943e..ddb0fac 100644
--- a/drivers/dahdi/tor2.c
+++ b/drivers/dahdi/tor2.c
@@ -200,7 +200,7 @@ static int tor2_spanconfig(struct dahdi_span *span, struct dahdi_lineconfig *lc)
 	struct tor2_span *p = span->pvt;
 
 	if (debug)
-		printk("Tor2: Configuring span %d\n", span->spanno);
+		printk(KERN_INFO "Tor2: Configuring span %d\n", span->spanno);
 
 	span->syncsrc = p->tor->syncsrc;
 	
@@ -233,9 +233,9 @@ static int tor2_chanconfig(struct dahdi_chan *chan, int sigtype)
 	alreadyrunning = chan->span->flags & DAHDI_FLAG_RUNNING;
 	if (debug) {
 		if (alreadyrunning)
-			printk("Tor2: Reconfigured channel %d (%s) sigtype %d\n", chan->channo, chan->name, sigtype);
+			printk(KERN_INFO "Tor2: Reconfigured channel %d (%s) sigtype %d\n", chan->channo, chan->name, sigtype);
 		else
-			printk("Tor2: Configured channel %d (%s) sigtype %d\n", chan->channo, chan->name, sigtype);
+			printk(KERN_INFO "Tor2: Configured channel %d (%s) sigtype %d\n", chan->channo, chan->name, sigtype);
 	}		
 	/* nothing more to do if an E1 */
 	if (p->tor->cardtype == TYPE_E1) return 0;
@@ -312,7 +312,7 @@ static int __devinit tor2_launch(struct tor2 *tor)
 {
 	if (tor->spans[0].flags & DAHDI_FLAG_REGISTERED)
 		return 0;
-	printk("Tor2: Launching card: %d\n", tor->order);
+	printk(KERN_INFO "Tor2: Launching card: %d\n", tor->order);
 	if (dahdi_register(&tor->spans[0], 0)) {
 		printk(KERN_ERR "Unable to register span %s\n", tor->spans[0].name);
 		return -1;
@@ -424,14 +424,14 @@ static int __devinit tor2_probe(struct pci_dev *pdev, const struct pci_device_id
 		goto err_out_release_plx_region;
 	}
 	pci_set_drvdata(pdev, tor);
-	printk("Detected %s at 0x%lx/0x%lx irq %d\n", tor->type, 
+	printk(KERN_INFO "Detected %s at 0x%lx/0x%lx irq %d\n", tor->type, 
 		tor->xilinx32_region, tor->xilinx8_region,tor->irq);
 
 	for (x = 0; x < MAX_TOR_CARDS; x++) {
 		if (!cards[x]) break;
 	}
 	if (x >= MAX_TOR_CARDS) {
-		printk("No cards[] slot available!!\n");
+		printk(KERN_DEBUG "No cards[] slot available!!\n");
 		goto err_out_release_all;
 	}
 	tor->num = x;
@@ -452,21 +452,21 @@ static int __devinit tor2_probe(struct pci_dev *pdev, const struct pci_device_id
 	while (le32_to_cpu(*gpdata_io) & (GPIO_INIT | GPIO_DONE) && (jiffies <= endjif));
 
 	if (endjif < jiffies) {
-		printk("Timeout waiting for INIT and DONE to go low\n");
+		printk(KERN_DEBUG "Timeout waiting for INIT and DONE to go low\n");
 		goto err_out_release_all;
 	}
-	if (debug) printk("fwload: Init and done gone to low\n");
+	if (debug) printk(KERN_DEBUG "fwload: Init and done gone to low\n");
 	gpdata |= GPIO_PROGRAM;
 	*gpdata_io = cpu_to_le32(gpdata);  /* de-activate the PROGRAM signal */
 	/* wait for INIT to go high (clearing done */
 	endjif = jiffies + 10;
 	while (!(le32_to_cpu(*gpdata_io) & GPIO_INIT) && (jiffies <= endjif));
 	if (endjif < jiffies) {
-		printk("Timeout waiting for INIT to go high\n");
+		printk(KERN_DEBUG "Timeout waiting for INIT to go high\n");
 		goto err_out_release_all;
 	}
 
-	if (debug) printk("fwload: Init went high (clearing done)\nNow loading...\n");
+	if (debug) printk(KERN_DEBUG "fwload: Init went high (clearing done)\nNow loading...\n");
 	/* assert WRITE signal */
 	gpdata &= ~GPIO_WRITE;
 	*gpdata_io = cpu_to_le32(gpdata);
@@ -479,29 +479,29 @@ static int __devinit tor2_probe(struct pci_dev *pdev, const struct pci_device_id
 		  /* if INIT drops, we're screwed, exit */
 		if (!(le32_to_cpu(*gpdata_io) & GPIO_INIT)) break;
 	   }
-	if (debug) printk("fwload: Transferred %d bytes into chip\n",x);
+	if (debug) printk(KERN_DEBUG "fwload: Transferred %d bytes into chip\n",x);
 	/* Wait for FIFO to clear */
 	endjif = jiffies + 2;
 	while (jiffies < endjif); /* wait */
 	  /* de-assert write signal */
 	gpdata |= GPIO_WRITE;
 	*gpdata_io = cpu_to_le32(gpdata);
-	if (debug) printk("fwload: Loading done!\n");	
+	if (debug) printk(KERN_DEBUG "fwload: Loading done!\n");	
 
 	/* Wait for FIFO to clear */
 	endjif = jiffies + 2;
 	while (jiffies < endjif); /* wait */
 	if (!(le32_to_cpu(*gpdata_io) & GPIO_INIT))
 	   {
-		printk("Drove Init low!! CRC Error!!!\n");
+		printk(KERN_NOTICE "Drove Init low!! CRC Error!!!\n");
 		goto err_out_release_all;
 	   }
 	if (!(le32_to_cpu(*gpdata_io) & GPIO_DONE))
 	   {
-		printk("Did not get DONE signal. Short file maybe??\n");
+		printk(KERN_DEBUG "Did not get DONE signal. Short file maybe??\n");
 		goto err_out_release_all;
 	   }
-	printk("Xilinx Chip successfully loaded, configured and started!!\n");
+	printk(KERN_INFO "Xilinx Chip successfully loaded, configured and started!!\n");
 
 	tor->mem8[SYNCREG] = 0;
 	tor->mem8[CTLREG] = 0;
@@ -537,11 +537,11 @@ static int __devinit tor2_probe(struct pci_dev *pdev, const struct pci_device_id
 	}
 
 	if (t1in(tor,1,0xf) & 0x80) {
-		printk("Tormenta 2 Quad E1/PRA Card\n");
+		printk(KERN_INFO "Tormenta 2 Quad E1/PRA Card\n");
 		tor->cardtype = TYPE_E1;
 		tor->datxlt = datxlt_e1;
 	} else {
-		printk("Tormenta 2 Quad T1/PRI Card\n");
+		printk(KERN_INFO "Tormenta 2 Quad T1/PRI Card\n");
 		tor->cardtype = TYPE_T1;
 		tor->datxlt = datxlt_t1;
 	}
@@ -558,7 +558,7 @@ static int __devinit tor2_probe(struct pci_dev *pdev, const struct pci_device_id
 	init_spans(tor); 
 
 	tor->order = tor->mem8[SWREG];
-	printk("Detected Card number: %d\n", tor->order);
+	printk(KERN_INFO "Detected Card number: %d\n", tor->order);
 
 	/* Launch cards as appropriate */
 	x = 0;
@@ -640,13 +640,13 @@ static struct pci_driver tor2_driver = {
 static int __init tor2_init(void) {
 	int res;
 	res = dahdi_pci_module(&tor2_driver);
-	printk("Registered Tormenta2 PCI\n");
+	printk(KERN_INFO "Registered Tormenta2 PCI\n");
 	return res;
 }
 
 static void __exit tor2_cleanup(void) {
 	pci_unregister_driver(&tor2_driver);
-	printk("Unregistered Tormenta2\n");
+	printk(KERN_INFO "Unregistered Tormenta2\n");
 }
 
 static void set_clear(struct tor2 *tor)
@@ -661,7 +661,7 @@ static void set_clear(struct tor2 *tor)
 
 			if ((i % 8)==7) {
 #if 0
-				printk("Putting %d in register %02x on span %d\n",
+				printk(KERN_DEBUG "Putting %d in register %02x on span %d\n",
 				       val, 0x39 + j, 1 + s);
 #endif
 				t1out(tor,1 + s, 0x39 + j, val);
@@ -680,7 +680,7 @@ static int tor2_rbsbits(struct dahdi_chan *chan, int bits)
 	struct tor2_chan *p = chan->pvt;
 	unsigned long flags;
 #if 0
-	printk("Setting bits to %d on channel %s\n", bits, chan->name);
+	printk(KERN_DEBUG "Setting bits to %d on channel %s\n", bits, chan->name);
 #endif	
 	if (p->tor->cardtype == TYPE_E1) { /* do it E1 way */
 		if (chan->chanpos == 16) return 0;
@@ -752,7 +752,7 @@ static int tor2_shutdown(struct dahdi_span *span)
 
 	tspan = p->span + 1;
 	if (tspan < 0) {
-		printk("Tor2: Span '%d' isn't us?\n", span->spanno);
+		printk(KERN_DEBUG "Tor2: Span '%d' isn't us?\n", span->spanno);
 		return -1;
 	}
 
@@ -778,7 +778,7 @@ static int tor2_shutdown(struct dahdi_span *span)
 		/* No longer in use, disable interrupts */
 		p->tor->mem8[CTLREG] = 0;
 	if (debug)
-		printk("Span %d (%s) shutdown\n", span->spanno, span->name);
+		printk(KERN_DEBUG"Span %d (%s) shutdown\n", span->spanno, span->name);
 	return 0;
 }
 
@@ -797,7 +797,7 @@ static int tor2_startup(struct dahdi_span *span)
 
 	tspan = p->span + 1;
 	if (tspan < 0) {
-		printk("Tor2: Span '%d' isn't us?\n", span->spanno);
+		printk(KERN_DEBUG "Tor2: Span '%d' isn't us?\n", span->spanno);
 		return -1;
 	}
 
@@ -895,9 +895,9 @@ static int tor2_startup(struct dahdi_span *span)
 
 		if (debug) {
 			if (alreadyrunning) 
-				printk("Tor2: Reconfigured span %d (%s/%s%s) 120 Ohms\n", span->spanno, coding, framing, crcing);
+				printk(KERN_INFO "Tor2: Reconfigured span %d (%s/%s%s) 120 Ohms\n", span->spanno, coding, framing, crcing);
 			else
-				printk("Tor2: Startup span %d (%s/%s%s) 120 Ohms\n", span->spanno, coding, framing, crcing);
+				printk(KERN_INFO "Tor2: Startup span %d (%s/%s%s) 120 Ohms\n", span->spanno, coding, framing, crcing);
 		}
 	} else { /* is a T1 card */
 
@@ -982,15 +982,15 @@ static int tor2_startup(struct dahdi_span *span)
 
 		if (debug) {
 			if (alreadyrunning) 
-				printk("Tor2: Reconfigured span %d (%s/%s) LBO: %s\n", span->spanno, coding, framing, dahdi_lboname(span->txlevel));
+				printk(KERN_INFO "Tor2: Reconfigured span %d (%s/%s) LBO: %s\n", span->spanno, coding, framing, dahdi_lboname(span->txlevel));
 			else
-				printk("Tor2: Startup span %d (%s/%s) LBO: %s\n", span->spanno, coding, framing, dahdi_lboname(span->txlevel));
+				printk(KERN_INFO "Tor2: Startup span %d (%s/%s) LBO: %s\n", span->spanno, coding, framing, dahdi_lboname(span->txlevel));
 		}
 	}
-	if (p->tor->syncs[0] == span->spanno) printk("SPAN %d: Primary Sync Source\n",span->spanno);
-	if (p->tor->syncs[1] == span->spanno) printk("SPAN %d: Secondary Sync Source\n",span->spanno);
-	if (p->tor->syncs[2] == span->spanno) printk("SPAN %d: Tertiary Sync Source\n",span->spanno);
-	if (p->tor->syncs[3] == span->spanno) printk("SPAN %d: Quaternary Sync Source\n",span->spanno);
+	if (p->tor->syncs[0] == span->spanno) printk(KERN_INFO "SPAN %d: Primary Sync Source\n",span->spanno);
+	if (p->tor->syncs[1] == span->spanno) printk(KERN_INFO "SPAN %d: Secondary Sync Source\n",span->spanno);
+	if (p->tor->syncs[2] == span->spanno) printk(KERN_INFO "SPAN %d: Tertiary Sync Source\n",span->spanno);
+	if (p->tor->syncs[3] == span->spanno) printk(KERN_INFO "SPAN %d: Quaternary Sync Source\n",span->spanno);
 	return 0;
 }
 
@@ -1017,7 +1017,7 @@ static int tor2_maint(struct dahdi_span *span, int cmd)
 		    case DAHDI_MAINT_LOOPSTOP:
 			return -ENOSYS;
 		    default:
-			printk("Tor2: Unknown maint command: %d\n", cmd);
+			printk(KERN_NOTICE "Tor2: Unknown maint command: %d\n", cmd);
 			break;
 		}
 		return 0;
@@ -1049,7 +1049,7 @@ static int tor2_maint(struct dahdi_span *span, int cmd)
 	t1out(p->tor,tspan,0x30,0);	/* stop sending loopup code */
 	break;
     default:
-	printk("Tor2: Unknown maint command: %d\n", cmd);
+	printk(KERN_NOTICE "Tor2: Unknown maint command: %d\n", cmd);
 	break;
    }
     return 0;
@@ -1149,7 +1149,7 @@ found:
 			syncnum = newsyncnum;
 			syncsrc = newsyncsrc;
 			syncspan = newsyncspan;
-			if (debug) printk("New syncnum: %d, syncsrc: %d, syncspan: %d\n", syncnum, syncsrc, syncspan);
+			if (debug) printk(KERN_DEBUG "New syncnum: %d, syncsrc: %d, syncspan: %d\n", syncnum, syncsrc, syncspan);
 		}
 	}
 #endif	
@@ -1165,7 +1165,7 @@ found:
 			/* actually set the sync register */
 			tor->mem8[SYNCREG] = syncspan;
 #endif			
-			if (debug) printk("Card %d, using sync span %d, master\n", tor->num, syncspan);
+			if (debug) printk(KERN_DEBUG "Card %d, using sync span %d, master\n", tor->num, syncspan);
 			tor->master = MASTER;	
 		} else {
 #if 1
@@ -1173,7 +1173,7 @@ found:
 			tor->mem8[SYNCREG] = SYNCEXTERN;
 #endif			
 			tor->master = 0;
-			if (debug) printk("Card %d, using Timing Bus, NOT master\n", tor->num);	
+			if (debug) printk(KERN_DEBUG "Card %d, using Timing Bus, NOT master\n", tor->num);	
 		}
 	}
 	spin_unlock_irqrestore(&synclock, flags);
@@ -1204,7 +1204,7 @@ DAHDI_IRQ_HANDLER(tor2_intr)
 
 #if	0
 	if (!tor->passno)
-		printk("Interrupt handler\n");
+		printk(KERN_DEBUG "Interrupt handler\n");
 #endif
 
 	/* do the transmit output */