patch-2.3.37 linux/arch/m68k/kernel/bios32.c

• Lines: 79
• Date: Thu Jan 6 09:54:06 2000
• Orig file: v2.3.36/linux/arch/m68k/kernel/bios32.c
• Orig date: Tue Aug 31 17:29:12 1999

diff -u --recursive --new-file v2.3.36/linux/arch/m68k/kernel/bios32.c linux/arch/m68k/kernel/bios32.c
@@ -449,69 +449,6 @@
 
 #endif /* !PCI_MODIFY */
 
-/*
- * Given the vendor and device ids, find the n'th instance of that device
- * in the system.
- */
-
-int pcibios_find_device(unsigned short vendor, unsigned short device_id,
-			unsigned short index, unsigned char *bus,
-			unsigned char *devfn)
-{
-	unsigned int curr = 0;
-	struct pci_dev *dev;
-
-	for (dev = pci_devices; dev; dev = dev->next)
-	{
-		if (dev->vendor == vendor && dev->device == device_id)
-		{
-			if (curr == index)
-			{
-				*devfn = dev->devfn;
-				*bus = dev->bus->number;
-				return PCIBIOS_SUCCESSFUL;
-			}
-			++curr;
-		}
-	}
-	return PCIBIOS_DEVICE_NOT_FOUND;
-}
-
-/*
- * Given the class, find the n'th instance of that device
- * in the system.
- */
-
-int pcibios_find_class(unsigned int class_code, unsigned short index,
-		       unsigned char *bus, unsigned char *devfn)
-{
-	unsigned int curr = 0;
-	struct pci_dev *dev;
-
-	for (dev = pci_devices; dev; dev = dev->next)
-	{
-		if (dev->class == class_code)
-		{
-			if (curr == index)
-			{
-				*devfn = dev->devfn;
-				*bus = dev->bus->number;
-				return PCIBIOS_SUCCESSFUL;
-			}
-			++curr;
-		}
-	}
-	return PCIBIOS_DEVICE_NOT_FOUND;
-}
-
-int pcibios_present(void)
-{
-	if (MACH_IS_HADES)
-		return 1;
-	else
-		return 0;
-}
-
 void __init pcibios_init(void)
 {
 	printk("Linux/m68k PCI BIOS32 revision %x.%02x\n", MAJOR_REV, MINOR_REV);
@@ -574,7 +511,7 @@
 	 * Scan the tree, allocating PCI memory and I/O space.
 	 */
 
-	layout_bus(&pci_root, orig_mem_base, orig_io_base);
+	layout_bus(pci_bus_b(pci_root.next), orig_mem_base, orig_io_base);
 
 	pci_mem_base = orig_mem_base;
 	pci_io_base = orig_io_base;