[PATCH 1/1] Fix build failure drivers/parport/parport_pc.c for powerpc

[PATCH 1/1] Fix build failure drivers/parport/parport_pc.c for powerpc

[Tony Breeds]

In commit 51dcdfec6a274afc1c6fce180d582add9ff512c0 (parport: Use the PCI
IRQ if offered) parport_pc_probe_port() gained an irqflags arg.  This
isn't being supplied on powerpc.  This patch make powerpc fallback to
the old behaviour, that is using "0" for irqflags.

Fixes build failure:
In file included from drivers/parport/parport_pc.c:68:
arch/powerpc/include/asm/parport.h: In function 'parport_pc_find_nonpci_ports':
arch/powerpc/include/asm/parport.h:32: error: too few arguments to function 'parport_pc_probe_port'
arch/powerpc/include/asm/parport.h:32: error: too few arguments to function 'parport_pc_probe_port'
arch/powerpc/include/asm/parport.h:32: error: too few arguments to function 'parport_pc_probe_port'
make[3]: *** [drivers/parport/parport_pc.o] Error 1

Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
---
Resend due to MUA badness

 arch/powerpc/include/asm/parport.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/include/asm/parport.h b/arch/powerpc/include/asm/parport.h
index 414c50e..94942d6 100644
--- a/arch/powerpc/include/asm/parport.h
+++ b/arch/powerpc/include/asm/parport.h
@@ -29,7 +29,7 @@ static int __devinit parport_pc_find_nonpci_ports (int autoirq, int autodma)
 		prop = of_get_property(np, "interrupts", NULL);
 		if (!prop)
 			continue;
-		if (parport_pc_probe_port(io1, io2, prop[0], autodma, NULL) != NULL)
+		if (parport_pc_probe_port(io1, io2, prop[0], autodma, NULL, 0) != NULL)
 			count++;
 	}
 	return count;
-- 
1.6.0.6

[PATCH] parisc: fix the parameters of call to parport_pc_probe_port()

[Wei Yongjun]

commit 51dcdfec6a274afc1c6fce180d582add9ff512c0 (parport: Use the PCI
IRQ if offered) parport_pc_probe_port() gained an irqflags arg. This
break parisc. This patch make parisc fallback to the old behaviour,
that is using "0" for irqflags.

No test.

Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
---
 drivers/parisc/superio.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c
index 4fa3bb2..f6727e2 100644
--- a/drivers/parisc/superio.c
+++ b/drivers/parisc/superio.c
@@ -434,7 +434,8 @@ static void __init superio_parport_init(void)
 			0 /*base_hi*/,
 			PAR_IRQ, 
 			PARPORT_DMA_NONE /* dma */,
-			NULL /*struct pci_dev* */) )
+			NULL /*struct pci_dev* */,
+			0))
 
 		printk(KERN_WARNING PFX "Probing parallel port failed.\n");
 #endif	/* CONFIG_PARPORT_PC */
-- 
1.5.3.8

Re: [PATCH] parisc: fix the parameters of call to parport_pc_probe_port()

[Kyle McMartin]

On Tue, Apr 14, 2009 at 02:01:37PM +0800, Wei Yongjun wrote:
> commit 51dcdfec6a274afc1c6fce180d582add9ff512c0 (parport: Use the PCI
> IRQ if offered) parport_pc_probe_port() gained an irqflags arg. This
> break parisc. This patch make parisc fallback to the old behaviour,
> that is using "0" for irqflags.
> 
> No test.
> 

Looks good, thanks, applied.