patch-2.1.115 linux/drivers/fc4/soc.c

• Lines: 52
• Date: Tue Aug 4 16:49:18 1998
• Orig file: v2.1.114/linux/drivers/fc4/soc.c
• Orig date: Thu May 14 19:47:39 1998

diff -u --recursive --new-file v2.1.114/linux/drivers/fc4/soc.c linux/drivers/fc4/soc.c
@@ -501,7 +501,6 @@
 
 static inline void soc_init(struct linux_sbus_device *sdev, int no)
 {
-        struct devid_cookie dcookie;
 	unsigned char tmp[60];
 	int propl;
 	struct soc *s;
@@ -599,40 +598,15 @@
 	
 	soc_disable (s);
 	
-	irq = sdev->irqs[0].pri;
+	irq = sdev->irqs[0];
 
-#ifndef __sparc_v9__	
-	if (sparc_cpu_model != sun4d) {
-		if (request_irq (irq, soc_intr, SA_SHIRQ, "SOC", (void *)s)) {
-			soc_printk ("Cannot order irq %d to go\n", irq);
-			socs = s->next;
-			return;
-		}
-	} else {
-	        dcookie.real_dev_id = s;
-	        dcookie.bus_cookie = sdev;
-	        if (request_irq(irq, soc_intr, (SA_SHIRQ | SA_DCOOKIE), "SOC", &dcookie)) {
-			soc_printk ("Cannot order irq %d to go\n", irq);
-			socs = s->next;
-			return;
-		}
-		SOD(("IRQ %d %x\n", irq, dcookie.ret_ino))
-		irq = dcookie.ret_ino;
-	}
-#else
-	dcookie.real_dev_id = s;
-	dcookie.imap = dcookie.iclr = 0;
-	dcookie.pil = -1;
-	dcookie.bus_cookie = sdev->my_bus;
-	if (request_irq (irq, soc_intr, (SA_SHIRQ | SA_SBUS | SA_DCOOKIE), "SOC", &dcookie)) {
+	if (request_irq (irq, soc_intr, SA_SHIRQ, "SOC", (void *)s)) {
 		soc_printk ("Cannot order irq %d to go\n", irq);
 		socs = s->next;
 		return;
 	}
-	irq = dcookie.ret_ino;
-#endif
 
-	SOD(("SOC uses IRQ%d\n", irq))
+	SOD(("SOC uses IRQ%s\n", __irq_itoa(irq)))
 	
 	s->port[0].fc.irq = irq;
 	s->port[1].fc.irq = irq;