Skip to contentSkip to conversation

sparc: fix possible build error in arch/sparc/include/asm/parport.h

PATCH Applied Wei Yongjun 3 participants 3 messages Apr 14, 2009 SPARC + UltraSPARC (sparc/sparc64)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sparc: fix possible build error in arch/sparc/include/asm/parport.h

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

No test.

---
 arch/sparc/include/asm/parport.h |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
arch/sparc/include/asm/parport.h +3 -2
index dff3f02..ff9ead6 100644
@@ -117,7 +117,7 @@ static int __devinit ecpp_probe(struct of_device *op, const struct of_device_id
 	if (!strcmp(parent->name, "dma")) {
 		p = parport_pc_probe_port(base, base + 0x400,
 					  op->irqs[0], PARPORT_DMA_NOFIFO,
-					  op->dev.parent->parent);
+					  op->dev.parent->parent, 0);
 		if (!p)
 			return -ENOMEM;
 		dev_set_drvdata(&op->dev, p);
@@ -168,7 +168,8 @@ static int __devinit ecpp_probe(struct of_device *op, const struct of_device_id
 	p = parport_pc_probe_port(base, base + 0x400,
 				  op->irqs[0],
 				  slot,
-				  op->dev.parent);
+				  op->dev.parent,
+				  0);
 	err = -ENOMEM;
 	if (!p)
 		goto out_disable_irq;
Signature · 1 line
1.5.3.8
maintainer Applied
#1 lore raw

Re: [PATCH] sparc: fix possible build error in

From: Wei Yongjun <[email protected]>
Date: Tue, 14 Apr 2009 14:16:55 +0800

Quoted 8 lines

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

No test.

Applied, thank you.

#2 lore raw

Re: [PATCH] sparc: fix possible build error in

In reply to Wei Yongjun
Quoted 4 lines · Wei Yongjun

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

FWIW looks like this is already in Linus' tree:

http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h(783eb52013ad20784550bccd482e541c9619c2

Signature · 1 line
     2. That which causes joy or happiness.