aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/parport
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2012-05-08 07:14:49 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-08 11:55:26 -0400
commit2c03ead66a2f0f39c38a455891b749ad48a2e1a7 (patch)
tree85f1bf7c4bc9d3d1bbbd55326f91280b14e5fd0e /drivers/parport
parent5fc3249068c1ed87c6fd485f42ced24132405629 (diff)
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>
Diffstat (limited to 'drivers/parport')
-rw-r--r--drivers/parport/parport_pc.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index 0cb64f50cecd..937981a3a77f 100644
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -2351,7 +2351,7 @@ struct parport *parport_pc_probe_port(unsigned long int base,
2351 2351
2352 printk(KERN_INFO "%s: PC-style at 0x%lx", p->name, p->base); 2352 printk(KERN_INFO "%s: PC-style at 0x%lx", p->name, p->base);
2353 if (p->base_hi && priv->ecr) 2353 if (p->base_hi && priv->ecr)
2354 printk(" (0x%lx)", p->base_hi); 2354 printk(KERN_CONT " (0x%lx)", p->base_hi);
2355 if (p->irq == PARPORT_IRQ_AUTO) { 2355 if (p->irq == PARPORT_IRQ_AUTO) {
2356 p->irq = PARPORT_IRQ_NONE; 2356 p->irq = PARPORT_IRQ_NONE;
2357 parport_irq_probe(p); 2357 parport_irq_probe(p);
@@ -2362,7 +2362,7 @@ struct parport *parport_pc_probe_port(unsigned long int base,
2362 p->irq = PARPORT_IRQ_NONE; 2362 p->irq = PARPORT_IRQ_NONE;
2363 } 2363 }
2364 if (p->irq != PARPORT_IRQ_NONE) { 2364 if (p->irq != PARPORT_IRQ_NONE) {
2365 printk(", irq %d", p->irq); 2365 printk(KERN_CONT ", irq %d", p->irq);
2366 priv->ctr_writable |= 0x10; 2366 priv->ctr_writable |= 0x10;
2367 2367
2368 if (p->dma == PARPORT_DMA_AUTO) { 2368 if (p->dma == PARPORT_DMA_AUTO) {
@@ -2386,21 +2386,21 @@ struct parport *parport_pc_probe_port(unsigned long int base,
2386 /* p->ops->ecp_read_data = parport_pc_ecp_read_block_pio; */ 2386 /* p->ops->ecp_read_data = parport_pc_ecp_read_block_pio; */
2387#endif /* IEEE 1284 support */ 2387#endif /* IEEE 1284 support */
2388 if (p->dma != PARPORT_DMA_NONE) { 2388 if (p->dma != PARPORT_DMA_NONE) {
2389 printk(", dma %d", p->dma); 2389 printk(KERN_CONT ", dma %d", p->dma);
2390 p->modes |= PARPORT_MODE_DMA; 2390 p->modes |= PARPORT_MODE_DMA;
2391 } else 2391 } else
2392 printk(", using FIFO"); 2392 printk(KERN_CONT ", using FIFO");
2393 } else 2393 } else
2394 /* We can't use the DMA channel after all. */ 2394 /* We can't use the DMA channel after all. */
2395 p->dma = PARPORT_DMA_NONE; 2395 p->dma = PARPORT_DMA_NONE;
2396#endif /* Allowed to use FIFO/DMA */ 2396#endif /* Allowed to use FIFO/DMA */
2397 2397
2398 printk(" ["); 2398 printk(KERN_CONT " [");
2399 2399
2400#define printmode(x) \ 2400#define printmode(x) \
2401 {\ 2401 {\
2402 if (p->modes & PARPORT_MODE_##x) {\ 2402 if (p->modes & PARPORT_MODE_##x) {\
2403 printk("%s%s", f ? "," : "", #x);\ 2403 printk(KERN_CONT "%s%s", f ? "," : "", #x);\
2404 f++;\ 2404 f++;\
2405 } \ 2405 } \
2406 } 2406 }
@@ -2416,9 +2416,9 @@ struct parport *parport_pc_probe_port(unsigned long int base,
2416 } 2416 }
2417#undef printmode 2417#undef printmode
2418#ifndef CONFIG_PARPORT_1284 2418#ifndef CONFIG_PARPORT_1284
2419 printk("(,...)"); 2419 printk(KERN_CONT "(,...)");
2420#endif /* CONFIG_PARPORT_1284 */ 2420#endif /* CONFIG_PARPORT_1284 */
2421 printk("]\n"); 2421 printk(KERN_CONT "]\n");
2422 if (probedirq != PARPORT_IRQ_NONE) 2422 if (probedirq != PARPORT_IRQ_NONE)
2423 printk(KERN_INFO "%s: irq %d detected\n", p->name, probedirq); 2423 printk(KERN_INFO "%s: irq %d detected\n", p->name, probedirq);
2424 2424