patch-2.4.0-test8 linux/drivers/pcmcia/cardbus.c

• Lines: 54
• Date: Tue Sep 5 12:56:51 2000
• Orig file: v2.4.0-test7/linux/drivers/pcmcia/cardbus.c
• Orig date: Thu May 11 15:30:07 2000

diff -u --recursive --new-file v2.4.0-test7/linux/drivers/pcmcia/cardbus.c linux/drivers/pcmcia/cardbus.c
@@ -50,7 +50,6 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/config.h>
 #include <linux/string.h>
 #include <linux/malloc.h>
 #include <linux/mm.h>
@@ -232,21 +231,6 @@
     
 =====================================================================*/
 
-static int cb_assign_irq(u32 mask)
-{
-	int irq, try;
-
-	for (try = 0; try < 2; try++) {
-		for (irq = 1; irq < 32; irq++) {
-			if ((mask >> irq) & 1) {
-				if (try_irq(IRQ_TYPE_EXCLUSIVE, irq, try) == 0)
-					return irq;
-			}
-		}
-	}
-	return 0;
-}
-
 int cb_alloc(socket_info_t * s)
 {
 	struct pci_bus *bus;
@@ -310,8 +294,6 @@
 		/* Does this function have an interrupt at all? */
 		pci_readb(dev, PCI_INTERRUPT_PIN, &irq_pin);
 		if (irq_pin) {
-			if (!irq)
-				irq = cb_assign_irq(s->cap.irq_mask);
 			dev->irq = irq;
 			pci_writeb(dev, PCI_INTERRUPT_LINE, irq);
 		}
@@ -369,14 +351,7 @@
 
 void cb_release(socket_info_t * s)
 {
-	cb_config_t *c = s->cb_config;
-
 	DEBUG(0, "cs: cb_release(bus %d)\n", s->cap.cb_dev->subordinate->number);
-
-#ifdef CONFIG_ISA
-	if ((c[0].dev.irq != 0) && (c[0].dev.irq != s->cap.pci_irq))
-		undo_irq(IRQ_TYPE_EXCLUSIVE, c[0].dev.irq);
-#endif
 }
 
 /*=====================================================================