commit 8fae097debdf8ac9b66d220ac258535ea09f3898
author David S. Miller <davem@sunset.davemloft.net> Tue Jun 20 15:23:28 2006 -0700
committer David S. Miller <davem@sunset.davemloft.net> Fri Jun 23 23:15:00 2006 -0700
tree 9c022cbf14e9174946a503b116fdf7376b8ce0ce
parent d384ea691fe4ea8c2dd5b9b8d9042eb181776f18

[SBUS]: Start cleaning up generic sbus support layer.

In particular, move the IRQ probing out to sparc32/sparc64
arch specific code where it belongs.

Signed-off-by: David S. Miller <davem@davemloft.net>

arch/sparc64/kernel/sbus.c

diff --git a/arch/sparc64/kernel/sbus.c b/arch/sparc64/kernel/sbus.c
index 8812417..8f7877a 100644
--- a/arch/sparc64/kernel/sbus.c
+++ b/arch/sparc64/kernel/sbus.c
@@ -1225,3 +1225,24 @@
 
 	sysio_register_error_handlers(sbus);
 }
+
+void sbus_fill_device_irq(struct sbus_dev *sdev)
+{
+	struct linux_prom_irqs irqs[PROMINTR_MAX];
+	int len;
+
+	len = prom_getproperty(sdev->prom_node, "interrupts",
+			       (char *) irqs, sizeof(irqs));
+	if (len == -1 || len == 0) {
+		sdev->irqs[0] = 0;
+		sdev->num_irqs = 0;
+	} else {
+		unsigned int pri = irqs[0].pri;
+
+		sdev->num_irqs = 1;
+		if (pri < 0x20)
+			pri += sdev->slot * 8;
+
+		sdev->irqs[0] =	sbus_build_irq(sdev->bus, pri);
+	}
+}