tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

parport: Fix various uses of parport_pc

These got overlooked first time around.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by Alan Cox and committed by Linus Torvalds 28783eb5 cf545093

+5 -3
unified split
+3 -2
arch/sparc/include/asm/parport.h
··· 117 if (!strcmp(parent->name, "dma")) { 118 p = parport_pc_probe_port(base, base + 0x400, 119 op->irqs[0], PARPORT_DMA_NOFIFO, 120 - op->dev.parent->parent); 121 if (!p) 122 return -ENOMEM; 123 dev_set_drvdata(&op->dev, p); ··· 168 p = parport_pc_probe_port(base, base + 0x400, 169 op->irqs[0], 170 slot, 171 - op->dev.parent); 172 err = -ENOMEM; 173 if (!p) 174 goto out_disable_irq;
··· 117 if (!strcmp(parent->name, "dma")) { 118 p = parport_pc_probe_port(base, base + 0x400, 119 op->irqs[0], PARPORT_DMA_NOFIFO, 120 + op->dev.parent->parent, 0); 121 if (!p) 122 return -ENOMEM; 123 dev_set_drvdata(&op->dev, p); ··· 168 p = parport_pc_probe_port(base, base + 0x400, 169 op->irqs[0], 170 slot, 171 + op->dev.parent, 172 + 0); 173 err = -ENOMEM; 174 if (!p) 175 goto out_disable_irq;
+2 -1
drivers/parisc/superio.c
··· 434 0 /*base_hi*/, 435 PAR_IRQ, 436 PARPORT_DMA_NONE /* dma */, 437 - NULL /*struct pci_dev* */) ) 438 439 printk(KERN_WARNING PFX "Probing parallel port failed.\n"); 440 #endif /* CONFIG_PARPORT_PC */
··· 434 0 /*base_hi*/, 435 PAR_IRQ, 436 PARPORT_DMA_NONE /* dma */, 437 + NULL /*struct pci_dev* */), 438 + 0 /* shared irq flags */ ) 439 440 printk(KERN_WARNING PFX "Probing parallel port failed.\n"); 441 #endif /* CONFIG_PARPORT_PC */