UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

parport: use KERN_CONT in printk() continuation lines 

On Tue, May 8, 2012 at 10:48 AM, Sasha Levin <levinsasha928@gmail.com> wrote:
> Before:
> [   10.110626] parport0: PC-style at 0x378, irq 7 [PCSPP,TRISTATE]
>
> After:
> parport0: PC-style at 0x378
> , irq 7
>  [
> PCSPP
> ,TRISTATE
> ]

Reported-By: Sasha Levin <levinsasha928@gmail.com>
Signed-off-by: Kay Sievers <kay@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Kay Sievers 2012-05-08 13:14:49 +02:00 committed by Greg Kroah-Hartman
parent 5fc3249068
commit 2c03ead66a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/parport/parport_pc.c
View File

@ -2351,7 +2351,7 @@ struct parport *parport_pc_probe_port(unsigned long int base,
printk(KERN_INFO "%s: PC-style at 0x%lx", p->name, p->base); printk(KERN_INFO "%s: PC-style at 0x%lx", p->name, p->base);
if (p->base_hi && priv->ecr) if (p->base_hi && priv->ecr)
printk(" (0x%lx)", p->base_hi); printk(KERN_CONT " (0x%lx)", p->base_hi);
if (p->irq == PARPORT_IRQ_AUTO) { if (p->irq == PARPORT_IRQ_AUTO) {
p->irq = PARPORT_IRQ_NONE; p->irq = PARPORT_IRQ_NONE;
parport_irq_probe(p); parport_irq_probe(p);
@ -2362,7 +2362,7 @@ struct parport *parport_pc_probe_port(unsigned long int base,
p->irq = PARPORT_IRQ_NONE; p->irq = PARPORT_IRQ_NONE;
} }
if (p->irq != PARPORT_IRQ_NONE) { if (p->irq != PARPORT_IRQ_NONE) {
printk(", irq %d", p->irq); printk(KERN_CONT ", irq %d", p->irq);
priv->ctr_writable |= 0x10; priv->ctr_writable |= 0x10;
if (p->dma == PARPORT_DMA_AUTO) { if (p->dma == PARPORT_DMA_AUTO) {
@ -2386,21 +2386,21 @@ struct parport *parport_pc_probe_port(unsigned long int base,
/* p->ops->ecp_read_data = parport_pc_ecp_read_block_pio; */ /* p->ops->ecp_read_data = parport_pc_ecp_read_block_pio; */
#endif /* IEEE 1284 support */ #endif /* IEEE 1284 support */
if (p->dma != PARPORT_DMA_NONE) { if (p->dma != PARPORT_DMA_NONE) {
printk(", dma %d", p->dma); printk(KERN_CONT ", dma %d", p->dma);
p->modes |= PARPORT_MODE_DMA; p->modes |= PARPORT_MODE_DMA;
} else } else
printk(", using FIFO"); printk(KERN_CONT ", using FIFO");
} else } else
/* We can't use the DMA channel after all. */ /* We can't use the DMA channel after all. */
p->dma = PARPORT_DMA_NONE; p->dma = PARPORT_DMA_NONE;
#endif /* Allowed to use FIFO/DMA */ #endif /* Allowed to use FIFO/DMA */
printk(" ["); printk(KERN_CONT " [");
#define printmode(x) \ #define printmode(x) \
{\ {\
if (p->modes & PARPORT_MODE_##x) {\ if (p->modes & PARPORT_MODE_##x) {\
printk("%s%s", f ? "," : "", #x);\ printk(KERN_CONT "%s%s", f ? "," : "", #x);\
f++;\ f++;\
} \ } \
} }
@ -2416,9 +2416,9 @@ struct parport *parport_pc_probe_port(unsigned long int base,
} }
#undef printmode #undef printmode
#ifndef CONFIG_PARPORT_1284 #ifndef CONFIG_PARPORT_1284
printk("(,...)"); printk(KERN_CONT "(,...)");
#endif /* CONFIG_PARPORT_1284 */ #endif /* CONFIG_PARPORT_1284 */
printk("]\n"); printk(KERN_CONT "]\n");
if (probedirq != PARPORT_IRQ_NONE) if (probedirq != PARPORT_IRQ_NONE)
printk(KERN_INFO "%s: irq %d detected\n", p->name, probedirq); printk(KERN_INFO "%s: irq %d detected\n", p->name, probedirq);