patch-2.3.13 linux/drivers/net/tulip.c

• Lines: 34
• Date: Fri Aug 6 10:41:47 1999
• Orig file: v2.3.12/linux/drivers/net/tulip.c
• Orig date: Thu Jul 8 15:42:20 1999

diff -u --recursive --new-file v2.3.12/linux/drivers/net/tulip.c linux/drivers/net/tulip.c
@@ -497,7 +497,7 @@
 			continue;
 		}
 #if LINUX_VERSION_CODE >= 0x20155
-		pci_ioaddr = pci_find_slot(pci_bus, pci_device_fn)->base_address[0];
+		pci_ioaddr = pci_find_slot(pci_bus, pci_device_fn)->resource[0].start;
 #else
 		pcibios_read_config_dword(pci_bus, pci_device_fn, PCI_BASE_ADDRESS_0,
 								  &pci_ioaddr);
@@ -572,23 +572,8 @@
 
 	dev = init_etherdev(dev, 0);
 
-#if LINUX_VERSION_CODE >= 0x20155
 	irq = pci_find_slot(pci_bus, pci_device_fn)->irq;
-	ioaddr = pci_find_slot(pci_bus, pci_device_fn)->base_address[0];
-#else
-	{
-		u8 pci_irq_line;
-		u32 pci_ioaddr;
-		pcibios_read_config_byte(pci_bus, pci_device_fn,
-								 PCI_INTERRUPT_LINE, &pci_irq_line);
-		pcibios_read_config_dword(pci_bus, pci_device_fn, PCI_BASE_ADDRESS_0,
-								  &pci_ioaddr);
-		irq = pci_irq_line;
-		ioaddr = pci_ioaddr;
-	}
-#endif
-	/* Remove I/O space marker in bit 0. */
-	ioaddr &= ~3;
+	ioaddr = pci_find_slot(pci_bus, pci_device_fn)->resource[0].start;
 
 	printk(KERN_INFO "%s: %s at %#3lx,",
 		   dev->name, tulip_tbl[chip_id].chip_name, ioaddr);