parisc, parport_gsc: Fixes for printk continuation lines
[ Upstream commit 83b5d1e3d3013dbf90645a5d07179d018c8243fa ] Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
4038524f7f
commit
2f970b437e
1 changed files with 4 additions and 4 deletions
|
@ -293,7 +293,7 @@ struct parport *parport_gsc_probe_port(unsigned long 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);
|
pr_cont(", irq %d", p->irq);
|
||||||
|
|
||||||
if (p->dma == PARPORT_DMA_AUTO) {
|
if (p->dma == PARPORT_DMA_AUTO) {
|
||||||
p->dma = PARPORT_DMA_NONE;
|
p->dma = PARPORT_DMA_NONE;
|
||||||
|
@ -303,8 +303,8 @@ struct parport *parport_gsc_probe_port(unsigned long base,
|
||||||
is mandatory (see above) */
|
is mandatory (see above) */
|
||||||
p->dma = PARPORT_DMA_NONE;
|
p->dma = PARPORT_DMA_NONE;
|
||||||
|
|
||||||
printk(" [");
|
pr_cont(" [");
|
||||||
#define printmode(x) {if(p->modes&PARPORT_MODE_##x){printk("%s%s",f?",":"",#x);f++;}}
|
#define printmode(x) {if(p->modes&PARPORT_MODE_##x){pr_cont("%s%s",f?",":"",#x);f++;}}
|
||||||
{
|
{
|
||||||
int f = 0;
|
int f = 0;
|
||||||
printmode(PCSPP);
|
printmode(PCSPP);
|
||||||
|
@ -315,7 +315,7 @@ struct parport *parport_gsc_probe_port(unsigned long base,
|
||||||
// printmode(DMA);
|
// printmode(DMA);
|
||||||
}
|
}
|
||||||
#undef printmode
|
#undef printmode
|
||||||
printk("]\n");
|
pr_cont("]\n");
|
||||||
|
|
||||||
if (p->irq != PARPORT_IRQ_NONE) {
|
if (p->irq != PARPORT_IRQ_NONE) {
|
||||||
if (request_irq (p->irq, parport_irq_handler,
|
if (request_irq (p->irq, parport_irq_handler,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue