patch-2.4.5 linux/drivers/parport/parport_sunbpp.c

• Lines: 103
• Date: Tue May 22 19:54:04 2001
• Orig file: v2.4.4/linux/drivers/parport/parport_sunbpp.c
• Orig date: Sun Feb 18 19:49:54 2001

diff -u --recursive --new-file v2.4.4/linux/drivers/parport/parport_sunbpp.c linux/drivers/parport/parport_sunbpp.c
@@ -74,7 +74,7 @@
 	struct bpp_regs *regs = (struct bpp_regs *)p->base;
 
 	sbus_writeb(d, &regs->p_dr);
-	dprintk(("wrote 0x%x\n", d));
+	dprintk((KERN_DEBUG "wrote 0x%x\n", d));
 }
 
 static unsigned char parport_sunbpp_read_data(struct parport *p)
@@ -123,8 +123,8 @@
 	if (!(value_tcr & P_TCR_BUSY))
 		bits |= PARPORT_STATUS_BUSY;
 
-	dprintk(("tcr 0x%x ir 0x%x\n", regs->p_tcr, regs->p_ir));
-	dprintk(("read status 0x%x\n", bits));
+	dprintk((KERN_DEBUG "tcr 0x%x ir 0x%x\n", regs->p_tcr, regs->p_ir));
+	dprintk((KERN_DEBUG "read status 0x%x\n", bits));
 	return bits;
 }
 
@@ -144,8 +144,8 @@
 	if (value_or & P_OR_SLCT_IN)
 		bits |= PARPORT_CONTROL_SELECT;
 
-	dprintk(("tcr 0x%x or 0x%x\n", regs->p_tcr, regs->p_or));
-	dprintk(("read control 0x%x\n", bits));
+	dprintk((KERN_DEBUG "tcr 0x%x or 0x%x\n", regs->p_tcr, regs->p_or));
+	dprintk((KERN_DEBUG "read control 0x%x\n", bits));
 	return bits;
 }
 
@@ -162,7 +162,7 @@
 	unsigned char value_tcr = sbus_readb(&regs->p_tcr);
 	unsigned char value_or = sbus_readb(&regs->p_or);
 
-	dprintk(("frob1: tcr 0x%x or 0x%x\n", regs->p_tcr, regs->p_or));
+	dprintk((KERN_DEBUG "frob1: tcr 0x%x or 0x%x\n", regs->p_tcr, regs->p_or));
 	if (mask & PARPORT_CONTROL_STROBE) {
 		if (val & PARPORT_CONTROL_STROBE) {
 			value_tcr &= ~P_TCR_DS;
@@ -194,7 +194,7 @@
 
 	sbus_writeb(value_or, &regs->p_or);
 	sbus_writeb(value_tcr, &regs->p_tcr);
-	dprintk(("frob2: tcr 0x%x or 0x%x\n", regs->p_tcr, regs->p_or));
+	dprintk((KERN_DEBUG "frob2: tcr 0x%x or 0x%x\n", regs->p_tcr, regs->p_or));
 	return parport_sunbpp_read_control(p);
 }
 
@@ -218,7 +218,7 @@
 	struct bpp_regs *regs = (struct bpp_regs *)p->base;
 	unsigned char value_tcr = sbus_readb(&regs->p_tcr);
 
-	dprintk(("forward\n"));
+	dprintk((KERN_DEBUG "forward\n"));
 	value_tcr &= ~P_TCR_DIR;
 	sbus_writeb(value_tcr, &regs->p_tcr);
 }
@@ -228,7 +228,7 @@
 	struct bpp_regs *regs = (struct bpp_regs *)p->base;
 	u8 val = sbus_readb(&regs->p_tcr);
 
-	dprintk(("reverse\n"));
+	dprintk((KERN_DEBUG "reverse\n"));
 	val |= P_TCR_DIR;
 	sbus_writeb(val, &regs->p_tcr);
 }
@@ -311,7 +311,7 @@
 	struct bpp_regs *regs;
 	unsigned char value_tcr;
 
-	dprintk(("init_one_port(%p): ranges, alloc_io, ", sdev));
+	dprintk((KERN_DEBUG "init_one_port(%p): ranges, alloc_io, ", sdev));
 	irq = sdev->irqs[0];
 	base = sbus_ioremap(&sdev->resource[0], 0,
 			    sdev->reg_addrs[0].reg_size, 
@@ -328,7 +328,7 @@
 
         memcpy (ops, &parport_sunbpp_ops, sizeof (struct parport_operations));
 
-	dprintk(("register_port, "));
+	dprintk(("register_port\n"));
 	if (!(p = parport_register_port(base, irq, dma, ops))) {
 		kfree(ops);
 		sbus_iounmap(base, size);
@@ -337,7 +337,7 @@
 
 	p->size = size;
 
-	dprintk(("init_one_port: request_irq(%08x:%p:%x:%s:%p) ",
+	dprintk((KERN_DEBUG "init_one_port: request_irq(%08x:%p:%x:%s:%p) ",
 		p->irq, parport_sunbpp_interrupt, SA_SHIRQ, p->name, p));
 	if ((err = request_irq(p->irq, parport_sunbpp_interrupt,
 			       SA_SHIRQ, p->name, p)) != 0) {
@@ -352,7 +352,7 @@
 	}
 
 	regs = (struct bpp_regs *)p->base;
-	dprintk(("forward\n"));
+	dprintk((KERN_DEBUG "forward\n"));
 	value_tcr = sbus_readb(&regs->p_tcr);
 	value_tcr &= ~P_TCR_DIR;
 	sbus_writeb(value_tcr, &regs->p_tcr);