Yet more PCI fixes for 2.5.70

diff -Nru a/drivers/pci/proc.c b/drivers/pci/proc.c
@@ -579,19 +579,17 @@
 
 static int __init pci_proc_init(void)
 {
-	if (pci_present()) {
-		struct proc_dir_entry *entry;
-		struct pci_dev *dev = NULL;
-		proc_bus_pci_dir = proc_mkdir("pci", proc_bus);
-		entry = create_proc_entry("devices", 0, proc_bus_pci_dir);
-		if (entry)
-			entry->proc_fops = &proc_bus_pci_dev_operations;
-		proc_initialized = 1;
-		while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
-			pci_proc_attach_device(dev);
-		}
-		legacy_proc_init();
+	struct proc_dir_entry *entry;
+	struct pci_dev *dev = NULL;
+	proc_bus_pci_dir = proc_mkdir("pci", proc_bus);
+	entry = create_proc_entry("devices", 0, proc_bus_pci_dir);
+	if (entry)
+		entry->proc_fops = &proc_bus_pci_dev_operations;
+	proc_initialized = 1;
+	while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
+		pci_proc_attach_device(dev);
 	}
+	legacy_proc_init();
 	return 0;
 }
 

diff -Nru a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
@@ -1939,8 +1939,8 @@
 
 #ifdef CONFIG_PCI
 	{
-		struct pci_bus *b;
-		pci_for_each_bus(b)
+		struct pci_bus *b = NULL;
+		while ((b = pci_find_next_bus(b)) != NULL)
 			sba_connect_bus(b);
 	}
 #endif

diff -Nru a/sound/oss/es1370.c b/sound/oss/es1370.c
@@ -2739,8 +2739,6 @@
 
 static int __init init_es1370(void)
 {
-	if (!pci_present())   /* No PCI bus in this machine! */
-		return -ENODEV;
 	printk(KERN_INFO "es1370: version v0.38 time " __TIME__ " " __DATE__ "\n");
 	return pci_module_init(&es1370_driver);
 }

diff -Nru a/sound/oss/ite8172.c b/sound/oss/ite8172.c
@@ -1940,8 +1940,6 @@
 
 static int __init init_it8172(void)
 {
-    if (!pci_present())   /* No PCI bus in this machine! */
-	return -ENODEV;
     printk("version v0.26 time " __TIME__ " " __DATE__ "\n");
     return pci_module_init(&it8172_driver);
 }

diff -Nru a/drivers/scsi/eata.c b/drivers/scsi/eata.c
@@ -959,8 +959,6 @@
    unsigned int addr;
    struct pci_dev *dev = NULL;
 
-   if (!pci_present()) return NULL;
-
    while((dev = pci_find_class(PCI_CLASS_STORAGE_SCSI << 8, dev))) {
       addr = pci_resource_start (dev, 0);
 

@@ -983,8 +981,6 @@
 
    struct pci_dev *dev = NULL;
 
-   if (!pci_present()) return;
-
    while((dev = pci_find_class(PCI_CLASS_STORAGE_SCSI << 8, dev))) {
 
 #if defined(DEBUG_PCI_DETECT)

@@ -1409,8 +1405,6 @@
    unsigned int addr, k;
 
    struct pci_dev *dev = NULL;
-
-   if (!pci_present()) return;
 
    for (k = 0; k < MAX_PCI; k++) {
 

diff -Nru a/sound/oss/i810_audio.c b/sound/oss/i810_audio.c
@@ -3449,9 +3449,6 @@
 
 static int __init i810_init_module (void)
 {
-	if (!pci_present())   /* No PCI bus in this machine! */
-		return -ENODEV;
-
 	printk(KERN_INFO "Intel 810 + AC97 Audio, version "
 	       DRIVER_VERSION ", " __TIME__ " " __DATE__ "\n");
 

diff -Nru a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c
@@ -7821,9 +7821,6 @@
 	IXJ *j = NULL;
 	int result;
 
-	if(!pci_present())
-		return 0;
-
 	for (i = 0; i < IXJMAX - *cnt; i++) {
 		pci = pci_find_device(0x15E2, 0x0500, pci);
 		if (!pci)

@@ -7869,10 +7866,8 @@
 	if ((probe = ixj_probe_isa(&cnt)) < 0) {
 		return probe;
 	}
-	if (pci_present()) {
-		if ((probe = ixj_probe_pci(&cnt)) < 0) {
-			return probe;
-		}
+	if ((probe = ixj_probe_pci(&cnt)) < 0) {
+		return probe;
 	}
 	printk("%s\n", ixj_c_rcsid);
 	create_proc_read_entry ("ixj", 0, NULL, ixj_read_proc, NULL);

diff -Nru a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c
@@ -484,11 +484,3 @@
 
 	return -EOPNOTSUPP;
 }
-
-/* Return the index of the PCI controller for device PDEV. */
-int
-pci_controller_num(struct pci_dev *pdev)
-{
-        struct pci_controller *hose = pdev->sysdata;
-	return (hose ? (int) hose->index : -ENXIO);
-}

diff -Nru a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
@@ -1889,7 +1889,7 @@
 		handle = parent;
 	} while (ACPI_SUCCESS(status));
 
-	printk(KERN_WARNING "No IOC for PCI Bus %02x:%02x in ACPI\n", PCI_SEGMENT(bus), bus->number);
+	printk(KERN_WARNING "No IOC for PCI Bus %04x:%02x in ACPI\n", pci_domain_nr(bus), bus->number);
 }
 
 static int __init

diff -Nru a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
@@ -87,14 +87,14 @@
 static int
 pci_sal_read (struct pci_bus *bus, unsigned int devfn, int where, int size, u32 *value)
 {
-	return __pci_sal_read(PCI_SEGMENT(bus), bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn),
+	return __pci_sal_read(pci_domain_nr(bus), bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn),
 			      where, size, value);
 }
 
 static int
 pci_sal_write (struct pci_bus *bus, unsigned int devfn, int where, int size, u32 value)
 {
-	return __pci_sal_write(PCI_SEGMENT(bus), bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn),
+	return __pci_sal_write(pci_domain_nr(bus), bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn),
 			       where, size, value);
 }
 

diff -Nru a/arch/ppc/kernel/pci.c b/arch/ppc/kernel/pci.c
@@ -1483,16 +1483,6 @@
 }
 
 /*
- * Return the index of the PCI controller for device pdev.
- */
-int pci_controller_num(struct pci_dev *dev)
-{
-	struct pci_controller *hose = (struct pci_controller *) dev->sysdata;
-
-	return hose->index;
-}
-
-/*
  * Platform support for /proc/bus/pci/X/Y mmap()s,
  * modelled on the sparc64 implementation by Dave Miller.
  *  -- paulus.

diff -Nru a/arch/ppc64/kernel/pci.c b/arch/ppc64/kernel/pci.c
@@ -371,11 +371,11 @@
 }
 
 /*
- * Return the index of the PCI controller for device pdev.
+ * Return the domain number for this bus.
  */
-int pci_controller_num(struct pci_dev *dev)
+int pci_domain_nr(struct pci_bus *bus)
 {
-	struct pci_controller *hose = PCI_GET_PHB_PTR(dev);
+	struct pci_controller *hose = PCI_GET_PHB_PTR(bus);
 
 	return hose->global_number;
 }

diff -Nru a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c
@@ -802,11 +802,11 @@
 	return 0;
 }
 
-/* Return the index of the PCI controller for device PDEV. */
+/* Return the domain nuber for this pci bus */
 
-int pci_controller_num(struct pci_dev *pdev)
+int pci_domain_nr(struct pci_bus *bus)
 {
-	struct pcidev_cookie *cookie = pdev->sysdata;
+	struct pcidev_cookie *cookie = bus->sysdata;
 	int ret;
 
 	if (cookie != NULL) {

diff -Nru a/drivers/pci/probe.c b/drivers/pci/probe.c
@@ -529,7 +529,8 @@
 	pci_name_device(dev);
 
 	/* now put in global tree */
-	strcpy(dev->dev.bus_id,dev->slot_name);
+	sprintf(dev->dev.bus_id, "%04x:%s", pci_domain_nr(bus),
+			dev->slot_name);
 	dev->dev.dma_mask = &dev->dma_mask;
 
 	return dev;

diff -Nru a/drivers/pci/proc.c b/drivers/pci/proc.c
@@ -210,7 +210,7 @@
 
 	switch (cmd) {
 	case PCIIOC_CONTROLLER:
-		ret = pci_controller_num(dev);
+		ret = pci_domain_nr(dev->bus);
 		break;
 
 #ifdef HAVE_PCI_MMAP

diff -Nru a/include/asm-alpha/pci.h b/include/asm-alpha/pci.h
@@ -188,12 +188,11 @@
 	/* Nothing to do. */
 }
 
-/* Return the index of the PCI controller for device PDEV. */
-extern int pci_controller_num(struct pci_dev *pdev);
-
 extern void
 pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
 			 struct resource *res);
+
+#define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index
 
 #endif /* __KERNEL__ */
 

diff -Nru a/include/asm-arm/pci.h b/include/asm-arm/pci.h
@@ -128,14 +128,6 @@
  */
 #define pci_dac_dma_supported(pci_dev, mask)	(0)
 
-/*
- * Return the index of the PCI controller for device PDEV.
- */
-static inline int pci_controller_num(struct pci_dev *dev)
-{
-	return 0;
-}
-
 
 #if defined(CONFIG_SA1111) && !defined(CONFIG_PCI)
 /*

diff -Nru a/include/asm-h8300/pci.h b/include/asm-h8300/pci.h
@@ -19,7 +19,4 @@
 	/* We don't do dynamic PCI IRQ allocation */
 }
 
-/* Return the index of the PCI controller for device PDEV. */
-#define pci_controller_num(PDEV)	(0)
-
 #endif /* _ASM_H8300_PCI_H */

diff -Nru a/include/asm-i386/pci.h b/include/asm-i386/pci.h
@@ -90,12 +90,6 @@
 #define sg_dma_address(sg)	((sg)->dma_address)
 #define sg_dma_len(sg)		((sg)->length)
 
-/* Return the index of the PCI controller for device. */
-static inline int pci_controller_num(struct pci_dev *dev)
-{
-	return 0;
-}
-
 #define HAVE_PCI_MMAP
 extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
 			       enum pci_mmap_state mmap_state, int write_combine);

diff -Nru a/include/asm-ia64/pci.h b/include/asm-ia64/pci.h
@@ -70,9 +70,6 @@
 #define pci_dac_dma_to_offset(dev,dma_addr)		((dma_addr) & ~PAGE_MASK)
 #define pci_dac_dma_sync_single(dev,dma_addr,len,dir)	do { mb(); } while (0)
 
-/* Return the index of the PCI controller for device PDEV. */
-#define pci_controller_num(PDEV)	(0)
-
 #define sg_dma_len(sg)		((sg)->dma_length)
 #define sg_dma_address(sg)	((sg)->dma_address)
 

@@ -95,7 +92,7 @@
 };
 
 #define PCI_CONTROLLER(busdev) ((struct pci_controller *) busdev->sysdata)
-#define PCI_SEGMENT(busdev)    (PCI_CONTROLLER(busdev)->segment)
+#define pci_domain_nr(busdev)    (PCI_CONTROLLER(busdev)->segment)
 
 /* generic pci stuff */
 #include <asm-generic/pci.h>

diff -Nru a/include/asm-m68k/pci.h b/include/asm-m68k/pci.h
@@ -45,9 +45,6 @@
 	/* We don't do dynamic PCI IRQ allocation */
 }
 
-/* Return the index of the PCI controller for device PDEV. */
-#define pci_controller_num(PDEV)	(0)
-
 /* The PCI address space does equal the physical memory
  * address space.  The networking and block device layers use
  * this boolean for bounce buffer decisions.

diff -Nru a/include/asm-mips/pci.h b/include/asm-mips/pci.h
@@ -237,9 +237,6 @@
 }
 
 
-/* Return the index of the PCI controller for device. */
-#define pci_controller_num(pdev)	(0)
-
 /*
  * These macros should be used after a pci_map_sg call has been done
  * to get bus addresses of each of the SG entries and their lengths.

diff -Nru a/include/asm-mips64/pci.h b/include/asm-mips64/pci.h
@@ -256,11 +256,6 @@
 }
 
 /*
- * Return the index of the PCI controller for device.
- */
-#define pci_controller_num(pdev)	(0)
-
-/*
  * These macros should be used after a pci_map_sg call has been done
  * to get bus addresses of each of the SG entries and their lengths.
  * You should only work with the number of sg entries pci_map_sg

diff -Nru a/include/asm-parisc/pci.h b/include/asm-parisc/pci.h
@@ -180,9 +180,6 @@
 /* Don't support DAC yet. */
 #define pci_dac_dma_supported(pci_dev, mask)   (0)
 
-/* Return the index of the PCI controller for device PDEV. */
-#define	pci_controller_num(PDEV)	(0)
-
 /* export the pci_ DMA API in terms of the dma_ one */
 #include <asm-generic/pci-dma-compat.h>
 

diff -Nru a/include/asm-ppc/pci-bridge.h b/include/asm-ppc/pci-bridge.h
@@ -39,7 +39,7 @@
  * Structure of a PCI controller (host bridge)
  */
 struct pci_controller {
-	int index;			/* used for pci_controller_num */
+	int index;			/* PCI domain number */
 	struct pci_controller *next;
         struct pci_bus *bus;
 	void *arch_data;

diff -Nru a/include/asm-ppc/pci.h b/include/asm-ppc/pci.h
@@ -266,7 +266,7 @@
 }
 
 /* Return the index of the PCI controller for device PDEV. */
-extern int pci_controller_num(struct pci_dev *pdev);
+#define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index
 
 /* Map a range of PCI memory or I/O space for a device into user space */
 int pci_mmap_page_range(struct pci_dev *pdev, struct vm_area_struct *vma,

diff -Nru a/include/asm-ppc64/pci.h b/include/asm-ppc64/pci.h
@@ -86,8 +86,7 @@
 	return 1;
 }
 
-/* Return the index of the PCI controller for device PDEV. */
-extern int pci_controller_num(struct pci_dev *pdev);
+extern int pci_domain_nr(struct pci_bus *bus);
 
 struct vm_area_struct;
 /* Map a range of PCI memory or I/O space for a device into user space */

diff -Nru a/include/asm-sh/pci.h b/include/asm-sh/pci.h
@@ -226,9 +226,6 @@
  */
 #define pci_dac_dma_supported(pci_dev, mask) (0)
 
-/* Return the index of the PCI controller for device PDEV. */
-#define pci_controller_num(PDEV)	(0)
-
 /* These macros should be used after a pci_map_sg call has been done
  * to get bus addresses of each of the SG entries and their lengths.
  * You should only work with the number of sg entries pci_map_sg

diff -Nru a/include/asm-sparc/pci.h b/include/asm-sparc/pci.h
@@ -132,9 +132,6 @@
 
 #define pci_dac_dma_supported(dev, mask)	(0)
 
-/* Return the index of the PCI controller for device PDEV. */
-#define pci_controller_num(PDEV)	(0)
-
 #endif /* __KERNEL__ */
 
 /* generic pci stuff */

diff -Nru a/include/asm-sparc64/pci.h b/include/asm-sparc64/pci.h
@@ -189,7 +189,7 @@
 
 /* Return the index of the PCI controller for device PDEV. */
 
-extern int pci_controller_num(struct pci_dev *pdev);
+extern int pci_domain_nr(struct pci_bus *bus);
 
 /* Platform support for /proc/bus/pci/X/Y mmap()s. */
 

diff -Nru a/include/asm-v850/rte_cb.h b/include/asm-v850/rte_cb.h
@@ -54,7 +54,6 @@
    instead, perversely enough, this becomes always true! */
 #define pci_dma_supported(dev, mask)		1
 #define pci_dac_dma_supported(dev, mask)	0
-#define pci_controller_num(dev)			0
 #define pcibios_assign_all_busses()		1
 
 

diff -Nru a/include/asm-x86_64/pci.h b/include/asm-x86_64/pci.h
@@ -270,12 +270,6 @@
 #define sg_dma_address(sg)	((sg)->dma_address)
 #define sg_dma_len(sg)		((sg)->length)
 
-/* Return the index of the PCI controller for device. */
-static inline int pci_controller_num(struct pci_dev *dev)
-{
-	return 0;
-}
-
 #define HAVE_PCI_MMAP
 extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
 			       enum pci_mmap_state mmap_state, int write_combine);

diff -Nru a/include/linux/pci.h b/include/linux/pci.h
@@ -805,5 +805,15 @@
 #define PCIPCI_VSFX		16
 #define PCIPCI_ALIMAGIK		32
 
+/*
+ * PCI domain support.  Sometimes called PCI segment (eg by ACPI),
+ * a PCI domain is defined to be a set of PCI busses which share
+ * configuration space.
+ */
+
+#ifndef CONFIG_PCI_DOMAINS
+#define pci_domain_nr(bus)	0
+#endif
+
 #endif /* __KERNEL__ */
 #endif /* LINUX_PCI_H */

diff -Nru a/drivers/scsi/qlogicisp.c b/drivers/scsi/qlogicisp.c
@@ -666,11 +666,6 @@
 
 	tmpt->proc_name = "isp1020";
 
-	if (pci_present() == 0) {
-		printk("qlogicisp : PCI not present\n");
-		return 0;
-	}
-
 	while ((pdev = pci_find_device(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP1020, pdev)))
 	{
 		if (pci_enable_device(pdev))

diff -Nru a/drivers/char/specialix.c b/drivers/char/specialix.c
@@ -2294,7 +2294,7 @@
 			found++;
 
 #ifdef CONFIG_PCI
-	if (pci_present()) {
+	{
 		struct pci_dev *pdev = NULL;
 
 		i=0;

diff -Nru a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c
@@ -1034,14 +1034,6 @@
     u8 intcf = 0;
     struct pci_dev *pdev = NULL;
 
-    /* The card is only available on PCI, so if we don't have a
-     * PCI bus, we are in trouble.
-     */
-
-    if (!pci_present()) {
-/*        printk ("%s: We really want a pci bios!\n", dev->name);*/
-        return -1;
-    }
     /* Loop basically until we don't find anymore. */
     while ((pdev = pci_find_class (PCI_CLASS_NETWORK_ETHERNET << 8, pdev))) {
 	if (pci_enable_device(pdev))

diff -Nru a/drivers/net/wan/lmc/lmc_ver.h b/drivers/net/wan/lmc/lmc_ver.h
@@ -69,12 +69,10 @@
 #if LINUX_VERSION_CODE < 0x20155 /* basically 2.2 plus */
 
 #define LMC_DEV_KFREE_SKB(skb) dev_kfree_skb((skb), FREE_WRITE)
-#define LMC_PCI_PRESENT() pcibios_present()
 
 #else /* Mostly 2.0 kernels */
 
 #define LMC_DEV_KFREE_SKB(skb) dev_kfree_skb(skb)
-#define LMC_PCI_PRESENT() pci_present()
 
 #endif
 

diff -Nru a/sound/oss/cs46xx.c b/sound/oss/cs46xx.c
@@ -5725,11 +5725,6 @@
 	int rtn = 0;
 	CS_DBGOUT(CS_INIT | CS_FUNCTION, 2, printk(KERN_INFO 
 		"cs46xx: cs46xx_init_module()+ \n"));
-	if (!pci_present()) {	/* No PCI bus in this machine! */
-		CS_DBGOUT(CS_INIT | CS_FUNCTION, 2, printk(KERN_INFO
-			"cs46xx: cs46xx_init_module()- no pci bus found\n"));
-		return -ENODEV;
-	}
 	rtn = pci_module_init(&cs46xx_pci_driver);
 
 	if(rtn == -ENODEV)

diff -Nru a/drivers/net/wan/sdladrv.c b/drivers/net/wan/sdladrv.c
@@ -1905,13 +1905,7 @@
 	struct pci_dev *pci_dev;
 
 
-#ifdef CONFIG_PCI
-        if(!pci_present())
-        {
-                printk(KERN_INFO "%s: PCI BIOS not present!\n", modname);
-                return 0;
-        }
-#else
+#ifndef CONFIG_PCI
         printk(KERN_INFO "%s: Linux not compiled for PCI usage!\n", modname);
         return 0;
 #endif

diff -Nru a/drivers/ide/ide.c b/drivers/ide/ide.c
@@ -2115,10 +2115,7 @@
 static void __init probe_for_hwifs (void)
 {
 #ifdef CONFIG_BLK_DEV_IDEPCI
-	if (pci_present())
-	{
-		ide_scan_pcibus(ide_scan_direction);
-	}
+	ide_scan_pcibus(ide_scan_direction);
 #endif /* CONFIG_BLK_DEV_IDEPCI */
 
 #ifdef CONFIG_ETRAX_IDE

diff -Nru a/drivers/char/rocket.c b/drivers/char/rocket.c
@@ -2713,12 +2713,8 @@
 	}
 
 #ifdef CONFIG_PCI
-	if (pci_present()) {
-		if (isa_boards_found < NUM_BOARDS)
-			pci_boards_found = init_PCI(isa_boards_found);
-	} else {
-		printk(KERN_INFO "No PCI BIOS found\n");
-	}
+	if (isa_boards_found < NUM_BOARDS)
+		pci_boards_found = init_PCI(isa_boards_found);
 #endif
 
 	max_board = pci_boards_found + isa_boards_found;

diff -Nru a/sound/oss/skeleton.c b/sound/oss/skeleton.c
@@ -159,10 +159,6 @@
 	struct pci_dev *pcidev=NULL;
 	int count=0;
 		
-	if(!pci_present())
-		return -ENODEV;
-	
-		
 	while((pcidev = pci_find_device(PCI_VENDOR_MYIDENT, PCI_DEVICE_ID_MYIDENT_MYCARD1, pcidev))!=NULL)
 	{
 		if (pci_enable_device(pcidev))

diff -Nru a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
@@ -360,7 +360,6 @@
  */
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 0)
 #define pci_set_dma_mask(dev, mask)		dev->dma_mask = mask;
-#define pci_present()				pcibios_present()
 #define pci_enable_device(pdev)			0
 #define pci_find_subsys(id, dev, sid, sdev, pdev) pci_find_device(id,dev,pdev)
 #define scsi_set_pci_device(host, pdev)

@@ -1008,11 +1007,6 @@
 	       "arguments to\n"
 	       "qla1280: insmod or else it might trash certain memory areas.\n");
 #endif
-
-	if (!pci_present()) {
-		printk(KERN_INFO "scsi: PCI not present\n");
-		return 0;
-	}
 
 	bdp = &ql1280_board_tbl[0];
 	qla1280_hostlist = NULL;

diff -Nru a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c
@@ -298,10 +298,6 @@
 	printk("%s\n", boot_msg);
 
 	/* Scan for Syskonnect FDDI PCI controllers */
-	if (!pci_present()) {	/* is PCI BIOS even present? */
-		printk("no PCI BIOS present\n");
-		return (-ENODEV);
-	}
 	for (i = 0; i < SKFP_MAX_NUM_BOARDS; i++) {	// scan for PCI cards
 		PRINTK(KERN_INFO "Check device %d\n", i);
 		if ((pdev=pci_find_device(PCI_VENDOR_ID_SK, PCI_DEVICE_ID_SK_FP,

diff -Nru a/drivers/scsi/sym53c8xx.c b/drivers/scsi/sym53c8xx.c
@@ -493,8 +493,6 @@
 #define PciDeviceFn(d)		((d)&0xff)
 #define __PciDev(busn, devfn)	(((busn)<<8)+(devfn))
 
-#define pci_present pcibios_present
-
 #define pci_read_config_byte(d, w, v) \
 	pcibios_read_config_byte(PciBusNumber(d), PciDeviceFn(d), w, v)
 #define pci_read_config_word(d, w, v) \

@@ -12903,12 +12901,6 @@
 #ifdef SCSI_NCR_NVRAM_SUPPORT
 	ncr_nvram  nvram0, nvram, *nvp;
 #endif
-
-	/*
-	**    PCI is required.
-	*/
-	if (!pci_present())
-		return 0;
 
 	/*
 	**    Initialize driver general stuff.

diff -Nru a/drivers/pci/pci.c b/drivers/pci/pci.c
@@ -55,11 +55,11 @@
 unsigned char __devinit
 pci_max_busnr(void)
 {
-	struct pci_bus* bus;
+	struct pci_bus *bus = NULL;
 	unsigned char max, n;
 
 	max = 0;
-	pci_for_each_bus(bus) {
+	while ((bus = pci_find_next_bus(bus)) != NULL) {
 		n = pci_bus_max_busnr(bus);
 		if(n > max)
 			max = n;

diff -Nru a/drivers/pci/power.c b/drivers/pci/power.c
@@ -97,12 +97,10 @@
 
 static int pci_pm_save_state(u32 state)
 {
-	struct list_head *list;
-	struct pci_bus *bus;
+	struct pci_bus *bus = NULL;
 	int error = 0;
 
-	list_for_each(list, &pci_root_buses) {
-		bus = pci_bus_b(list);
+	while ((bus = pci_find_next_bus(bus)) != NULL) {
 		error = pci_pm_save_state_bus(bus,state);
 		if (!error)
 			error = pci_pm_save_state_device(bus->self,state);

@@ -112,11 +110,9 @@
 
 static int pci_pm_suspend(u32 state)
 {
-	struct list_head *list;
-	struct pci_bus *bus;
+	struct pci_bus *bus = NULL;
 
-	list_for_each(list, &pci_root_buses) {
-		bus = pci_bus_b(list);
+	while ((bus = pci_find_next_bus(bus)) != NULL) {
 		pci_pm_suspend_bus(bus,state);
 		pci_pm_suspend_device(bus->self,state);
 	}

@@ -125,11 +121,9 @@
 
 static int pci_pm_resume(void)
 {
-	struct list_head *list;
-	struct pci_bus *bus;
+	struct pci_bus *bus = NULL;
 
-	list_for_each(list, &pci_root_buses) {
-		bus = pci_bus_b(list);
+	while ((bus = pci_find_next_bus(bus)) != NULL) {
 		pci_pm_resume_device(bus->self);
 		pci_pm_resume_bus(bus);
 	}

diff -Nru a/drivers/char/sx.c b/drivers/char/sx.c
@@ -2460,69 +2460,68 @@
 	}
 
 #ifdef CONFIG_PCI
-	if (pci_present ()) {
 #ifndef TWO_ZERO
-		while ((pdev = pci_find_device (PCI_VENDOR_ID_SPECIALIX, 
-		                                PCI_DEVICE_ID_SPECIALIX_SX_XIO_IO8, 
-			                              pdev))) {
-			if (pci_enable_device(pdev))
-				continue;
+	while ((pdev = pci_find_device (PCI_VENDOR_ID_SPECIALIX, 
+					PCI_DEVICE_ID_SPECIALIX_SX_XIO_IO8, 
+					      pdev))) {
+		if (pci_enable_device(pdev))
+			continue;
 #else
-			for (i=0;i< SX_NBOARDS;i++) {
-				if (pcibios_find_device (PCI_VENDOR_ID_SPECIALIX, 
-				                         PCI_DEVICE_ID_SPECIALIX_SX_XIO_IO8, i,
-					                       &pci_bus, &pci_fun)) break;
+	for (i=0;i< SX_NBOARDS;i++) {
+		if (pcibios_find_device (PCI_VENDOR_ID_SPECIALIX, 
+					 PCI_DEVICE_ID_SPECIALIX_SX_XIO_IO8, i,
+					       &pci_bus, &pci_fun))
+			break;
 #endif
-			/* Specialix has a whole bunch of cards with
-			   0x2000 as the device ID. They say its because
-			   the standard requires it. Stupid standard. */
-			/* It seems that reading a word doesn't work reliably on 2.0.
-			   Also, reading a non-aligned dword doesn't work. So we read the
-			   whole dword at 0x2c and extract the word at 0x2e (SUBSYSTEM_ID)
-			   ourselves */
-			/* I don't know why the define doesn't work, constant 0x2c does --REW */ 
-			pci_read_config_dword (pdev, 0x2c, &tint);
-			tshort = (tint >> 16) & 0xffff;
-			sx_dprintk (SX_DEBUG_PROBE, "Got a specialix card: %x.\n", tint);
-			/* sx_dprintk (SX_DEBUG_PROBE, "pdev = %d/%d	(%x)\n", pdev, tint); */ 
-			if ((tshort != 0x0200) && (tshort != 0x0300)) {
-				sx_dprintk (SX_DEBUG_PROBE, "But it's not an SX card (%d)...\n", 
-				            tshort);
-				continue;
-			}
-			board = &boards[found];
+		/* Specialix has a whole bunch of cards with
+		   0x2000 as the device ID. They say its because
+		   the standard requires it. Stupid standard. */
+		/* It seems that reading a word doesn't work reliably on 2.0.
+		   Also, reading a non-aligned dword doesn't work. So we read the
+		   whole dword at 0x2c and extract the word at 0x2e (SUBSYSTEM_ID)
+		   ourselves */
+		/* I don't know why the define doesn't work, constant 0x2c does --REW */ 
+		pci_read_config_dword (pdev, 0x2c, &tint);
+		tshort = (tint >> 16) & 0xffff;
+		sx_dprintk (SX_DEBUG_PROBE, "Got a specialix card: %x.\n", tint);
+		/* sx_dprintk (SX_DEBUG_PROBE, "pdev = %d/%d	(%x)\n", pdev, tint); */ 
+		if ((tshort != 0x0200) && (tshort != 0x0300)) {
+			sx_dprintk (SX_DEBUG_PROBE, "But it's not an SX card (%d)...\n", 
+				    tshort);
+			continue;
+		}
+		board = &boards[found];
 
-			board->flags &= ~SX_BOARD_TYPE;
-			board->flags |= (tshort == 0x200)?SX_PCI_BOARD:
-			                                  SX_CFPCI_BOARD;
+		board->flags &= ~SX_BOARD_TYPE;
+		board->flags |= (tshort == 0x200)?SX_PCI_BOARD:
+						  SX_CFPCI_BOARD;
 
-			/* CF boards use base address 3.... */
-			if (IS_CF_BOARD (board))
-				board->hw_base = pci_resource_start (pdev, 3);
-			else
-				board->hw_base = pci_resource_start (pdev, 2);
-			board->base2 = 
-			board->base = (ulong) ioremap(board->hw_base, WINDOW_LEN (board));
-			if (!board->base) {
-				printk(KERN_ERR "ioremap failed\n");
-				/* XXX handle error */
-			}
-
-			/* Most of the stuff on the CF board is offset by
-			   0x18000 ....  */
-			if (IS_CF_BOARD (board)) board->base += 0x18000;
-
-			board->irq = pdev->irq;
-
-			sx_dprintk (SX_DEBUG_PROBE, "Got a specialix card: %x/%lx(%d) %x.\n", 
-			            tint, boards[found].base, board->irq, board->flags);
-
-			if (probe_sx (board)) {
-				found++;
-				fix_sx_pci (pdev, board);
-			} else 
-				iounmap ((char *) (board->base));
-		}
+		/* CF boards use base address 3.... */
+		if (IS_CF_BOARD (board))
+			board->hw_base = pci_resource_start (pdev, 3);
+		else
+			board->hw_base = pci_resource_start (pdev, 2);
+		board->base2 = 
+		board->base = (ulong) ioremap(board->hw_base, WINDOW_LEN (board));
+		if (!board->base) {
+			printk(KERN_ERR "ioremap failed\n");
+			/* XXX handle error */
+		}
+
+		/* Most of the stuff on the CF board is offset by
+		   0x18000 ....  */
+		if (IS_CF_BOARD (board)) board->base += 0x18000;
+
+		board->irq = pdev->irq;
+
+		sx_dprintk (SX_DEBUG_PROBE, "Got a specialix card: %x/%lx(%d) %x.\n", 
+			    tint, boards[found].base, board->irq, board->flags);
+
+		if (probe_sx (board)) {
+			found++;
+			fix_sx_pci (pdev, board);
+		} else 
+			iounmap ((char *) (board->base));
 	}
 #endif
 

@@ -2648,4 +2647,5 @@
 
 module_init(sx_init);
 module_exit(sx_exit);
+
 

diff -Nru a/sound/oss/nec_vrc5477.c b/sound/oss/nec_vrc5477.c
@@ -2002,8 +2002,6 @@
 
 static int __init init_vrc5477_ac97(void)
 {
-	if (!pci_present())   /* No PCI bus in this machine! */
-		return -ENODEV;
 	printk("Vrc5477 AC97 driver: version v0.2 time " __TIME__ " " __DATE__ " by Jun Sun\n");
 	return pci_module_init(&vrc5477_ac97_driver);
 }

diff -Nru a/sound/oss/trident.c b/sound/oss/trident.c
@@ -4385,9 +4385,6 @@
 
 static int __init trident_init_module (void)
 {
-	if (!pci_present())   /* No PCI bus in this machine! */
-		return -ENODEV;
-
 	printk(KERN_INFO "Trident 4DWave/SiS 7018/ALi 5451,Tvia CyberPro "
 	       "5050 PCI Audio, version " DRIVER_VERSION ", " 
 	       __TIME__ " " __DATE__ "\n");

diff -Nru a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c
@@ -409,9 +409,6 @@
 		printk("%s\n", BootString);
 	}
 
-	if (!pci_present())		/* is PCI support present? */
-		return -ENODEV;
-
 	while((pdev = pci_find_device(PCI_VENDOR_ID_SYSKONNECT,
 				      PCI_DEVICE_ID_SYSKONNECT_GE, pdev)) != NULL) {
 

diff -Nru a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c
@@ -2694,12 +2694,6 @@
 #endif
 
 	/*
-	 *  PCI is required.
-	 */
-	if (!pci_present())
-		return 0;
-
-	/*
 	 *    Initialize driver general stuff.
 	 */
 #ifdef SYM_LINUX_BOOT_COMMAND_LINE_SUPPORT

diff -Nru a/drivers/pci/pool.c b/drivers/pci/pool.c
@@ -29,7 +29,8 @@
 };
 
 #define	POOL_TIMEOUT_JIFFIES	((100 /* msec */ * HZ) / 1000)
-#define	POOL_POISON_BYTE	0xa7
+#define	POOL_POISON_FREED	0xa7	/* !inuse */
+#define	POOL_POISON_ALLOCATED	0xa9	/* !initted */
 
 static DECLARE_MUTEX (pools_lock);
 

@@ -172,7 +173,7 @@
 	if (page->vaddr) {
 		memset (page->bitmap, 0xff, mapsize);	// bit set == free
 #ifdef	CONFIG_DEBUG_SLAB
-		memset (page->vaddr, POOL_POISON_BYTE, pool->allocation);
+		memset (page->vaddr, POOL_POISON_FREED, pool->allocation);
 #endif
 		list_add (&page->page_list, &pool->page_list);
 		page->in_use = 0;

@@ -201,7 +202,7 @@
 	dma_addr_t	dma = page->dma;
 
 #ifdef	CONFIG_DEBUG_SLAB
-	memset (page->vaddr, POOL_POISON_BYTE, pool->allocation);
+	memset (page->vaddr, POOL_POISON_FREED, pool->allocation);
 #endif
 	pci_free_consistent (pool->dev, pool->allocation, page->vaddr, dma);
 	list_del (&page->page_list);

@@ -309,6 +310,9 @@
 	page->in_use++;
 	retval = offset + page->vaddr;
 	*handle = offset + page->dma;
+#ifdef	CONFIG_DEBUG_SLAB
+	memset (retval, POOL_POISON_ALLOCATED, pool->size);
+#endif
 done:
 	spin_unlock_irqrestore (&pool->lock, flags);
 	return retval;

@@ -378,7 +382,7 @@
 			pool->name, (unsigned long long)dma);
 		return;
 	}
-	memset (vaddr, POOL_POISON_BYTE, pool->size);
+	memset (vaddr, POOL_POISON_FREED, pool->size);
 #endif
 
 	spin_lock_irqsave (&pool->lock, flags);

diff -Nru a/drivers/pci/search.c b/drivers/pci/search.c
@@ -29,10 +29,10 @@
 struct pci_bus *
 pci_find_bus(unsigned char busnr)
 {
-	struct pci_bus* bus;
+	struct pci_bus* bus = NULL;
 	struct pci_bus* tmp_bus;
 
-	pci_for_each_bus(bus) {
+	while ((bus = pci_find_next_bus(bus)) != NULL)  {
 		tmp_bus = pci_do_find_bus(bus, busnr);
 		if(tmp_bus)
 			return tmp_bus;

@@ -41,6 +41,26 @@
 }
 
 /**
+ * pci_find_next_bus - begin or continue searching for a PCI bus
+ * @from: Previous PCI bus found, or %NULL for new search.
+ *
+ * Iterates through the list of known PCI busses.  A new search is
+ * initiated by passing %NULL to the @from argument.  Otherwise if
+ * @from is not %NULL, searches continue from next device on the
+ * global list.
+ */
+struct pci_bus * 
+pci_find_next_bus(const struct pci_bus *from)
+{
+	struct list_head *n = from ? from->node.next : pci_root_buses.next;
+	struct pci_bus *b = NULL;
+
+	if (n != &pci_root_buses)
+		b = pci_bus_b(n);
+	return b;
+}
+
+/**
  * pci_find_slot - locate PCI device from a given PCI slot
  * @bus: number of PCI bus on which desired PCI device resides
  * @devfn: encodes number of PCI slot in which the desired PCI 

@@ -96,7 +116,6 @@
 	}
 	return NULL;
 }
-
 
 /**
  * pci_find_device - begin or continue searching for a PCI device by vendor/device id

diff -Nru a/include/linux/pci.h b/include/linux/pci.h
@@ -568,6 +568,7 @@
 struct pci_dev *pci_find_class (unsigned int class, const struct pci_dev *from);
 struct pci_dev *pci_find_slot (unsigned int bus, unsigned int devfn);
 int pci_find_capability (struct pci_dev *dev, int cap);
+struct pci_bus * pci_find_next_bus(const struct pci_bus *from);
 
 int pci_bus_read_config_byte (struct pci_bus *bus, unsigned int devfn, int where, u8 *val);
 int pci_bus_read_config_word (struct pci_bus *bus, unsigned int devfn, int where, u16 *val);

diff -Nru a/sound/oss/rme96xx.c b/sound/oss/rme96xx.c
@@ -1093,9 +1093,6 @@
 
 static int __init init_rme96xx(void)
 {
-  
-	if (!pci_present())   /* No PCI bus in this machine! */
-		return -ENODEV;
 	printk(KERN_INFO RME_MESS" version "RMEVERSION" time " __TIME__ " " __DATE__ "\n");
 	devices = ((devices-1) & RME96xx_MASK_DEVS) + 1;
 	printk(KERN_INFO RME_MESS" reserving %d dsp device(s)\n",devices);

diff -Nru a/drivers/scsi/tmscsim.c b/drivers/scsi/tmscsim.c
@@ -394,7 +394,7 @@
 # define PCI_WRITE_CONFIG_WORD(pd, rv, bv) pci_write_config_word (pd, rv, bv)
 # define PCI_READ_CONFIG_WORD(pd, rv, bv) pci_read_config_word (pd, rv, bv)
 # define PCI_BUS_DEV pdev->bus->number, pdev->devfn
-# define PCI_PRESENT pci_present ()
+# define PCI_PRESENT (1)
 # define PCI_SET_MASTER pci_set_master (pdev)
 # define PCI_FIND_DEVICE(vend, id) (pdev = pci_find_device (vend, id, pdev))
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,10)

diff -Nru a/drivers/scsi/inia100.c b/drivers/scsi/inia100.c
@@ -218,7 +218,7 @@
 	/*
 	 * PCI-bus probe.
 	 */
-	if (pci_present()) {
+	{
 		/*
 		 * Note: I removed the struct pci_device_list stuff since this
 		 * driver only cares about one device ID.  If that changes in

diff -Nru a/include/asm-sparc64/parport.h b/include/asm-sparc64/parport.h
@@ -121,9 +121,6 @@
 	struct linux_ebus_device *edev;
 	int count = 0;
 
-	if (!pci_present())
-		return 0;
-
 	for_each_ebus(ebus) {
 		for_each_ebusdev(edev, ebus) {
 			if (ebus_ecpp_p(edev)) {

diff -Nru a/drivers/scsi/aic7xxx_old.c b/drivers/scsi/aic7xxx_old.c
@@ -9033,7 +9033,6 @@
   /*
    * PCI-bus probe.
    */
-  if (pci_present())
   {
     struct
     {

@@ -9692,7 +9691,7 @@
         }
       } /* while(pdev=....) */
     } /* for PCI_DEVICES */
-  } /* PCI BIOS present */
+  }
 #endif /* CONFIG_PCI */
 
 #if defined(__i386__) || defined(__alpha__)

diff -Nru a/drivers/scsi/atp870u.c b/drivers/scsi/atp870u.c
@@ -2321,10 +2321,6 @@
 	};
 
 	printk(KERN_INFO "aec671x_detect: \n");
-	if (!pci_present()) {
-		printk(KERN_INFO "   NO PCI SUPPORT.\n");
-		return count;
-	}
 	tpnt->proc_name = "atp870u";
 
 	h = 0;

diff -Nru a/drivers/char/stallion.c b/drivers/char/stallion.c
@@ -2804,9 +2804,6 @@
 	printk("stl_findpcibrds()\n");
 #endif
 
-	if (! pci_present())
-		return(0);
-
 	for (i = 0; (i < stl_nrpcibrds); i++)
 		while ((dev = pci_find_device(stl_pcibrds[i].vendid,
 		    stl_pcibrds[i].devid, dev))) {

diff -Nru a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c
@@ -1186,10 +1186,6 @@
 #endif
 
 	memset(pci, 0, sizeof(struct pm2pci_par));
-	if (!pci_present()) {
-		DPRINTK("no PCI bus found.\n");
-		return 0;
-	}
 	DPRINTK("scanning PCI bus for known chipsets...\n");
 
 	while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {

diff -Nru a/drivers/mtd/devices/pmc551.c b/drivers/mtd/devices/pmc551.c
@@ -681,11 +681,6 @@
 
         printk(KERN_INFO PMC551_VERSION);
 
-        if(!pci_present()) {
-                printk(KERN_NOTICE "pmc551: PCI not enabled.\n");
-                return -ENODEV;
-        }
-
         /*
          * PCU-bus chipset probe.
          */

diff -Nru a/sound/oss/cmpci.c b/sound/oss/cmpci.c
@@ -3139,10 +3139,6 @@
 	struct pci_dev *pcidev = NULL;
 	int index = 0;
 
-#ifdef CONFIG_PCI
-	if (!pci_present())   /* No PCI bus in this machine! */
-#endif
-		return -ENODEV;
 	printk(KERN_INFO "cmpci: version $Revision: 5.64 $ time " __TIME__ " " __DATE__ "\n");
 
 	while (index < NR_DEVICE && (

diff -Nru a/drivers/scsi/pci2000.c b/drivers/scsi/pci2000.c
@@ -668,13 +668,6 @@
 	UCHAR			   *consistent;
 	dma_addr_t			consistentDma;
 
-
-	if ( !pci_present () )
-		{
-		printk ("pci2000: PCI BIOS not present\n");
-		return 0;
-		}
-
 	while ( (pdev = pci_find_device (VENDOR_PSI, DEVICE_ROY_1, pdev)) != NULL )
 		{
 		if (pci_enable_device(pdev))

diff -Nru a/drivers/net/fc/iph5526.c b/drivers/net/fc/iph5526.c
@@ -232,7 +232,7 @@
 
 int __init iph5526_probe(struct net_device *dev)
 {
-	if (pci_present() && (iph5526_probe_pci(dev) == 0))
+	if (iph5526_probe_pci(dev) == 0)
 		return 0;
 	return -ENODEV;
 }

@@ -3720,10 +3720,6 @@
 	unsigned long timeout;
 
 	tmpt->proc_name = "iph5526";
-	if (pci_present() == 0) {
-		printk("iph5526: PCI not present\n");
-		return 0;
-	}
 
 	for (i = 0; i <= MAX_FC_CARDS; i++) 
 		fc[i] = NULL;

diff -Nru a/drivers/net/dgrs.c b/drivers/net/dgrs.c
@@ -1356,55 +1356,51 @@
 	uint	irq;
 	uint	plxreg;
 	uint	plxdma;
+	struct pci_dev *pdev = NULL;
 
 	/*
 	 *	First, check for PCI boards
 	 */
-	if (pci_present())
+	while ((pdev = pci_find_device(SE6_PCI_VENDOR_ID, SE6_PCI_DEVICE_ID, pdev)) != NULL)
 	{
-		struct pci_dev *pdev = NULL;
+		/*
+		 * Get and check the bus-master and latency values.
+		 * Some PCI BIOSes fail to set the master-enable bit,
+		 * and the latency timer must be set to the maximum
+		 * value to avoid data corruption that occurs when the
+		 * timer expires during a transfer.  Yes, it's a bug.
+		 */
+		if (pci_enable_device(pdev))
+			continue;
+		pci_set_master(pdev);
+
+		plxreg = pci_resource_start (pdev, 0);
+		io = pci_resource_start (pdev, 1);
+		mem = pci_resource_start (pdev, 2);
+		pci_read_config_dword(pdev, 0x30, &plxdma);
+		irq = pdev->irq;
+		plxdma &= ~15;
+
+		/*
+		 * On some BIOSES, the PLX "expansion rom" (used for DMA)
+		 * address comes up as "0".  This is probably because
+		 * the BIOS doesn't see a valid 55 AA ROM signature at
+		 * the "ROM" start and zeroes the address.  To get
+		 * around this problem the SE-6 is configured to ask
+		 * for 4 MB of space for the dual port memory.  We then
+		 * must set its range back to 2 MB, and use the upper
+		 * half for DMA register access
+		 */
+		OUTL(io + PLX_SPACE0_RANGE, 0xFFE00000L);
+		if (plxdma == 0)
+			plxdma = mem + (2048L * 1024L);
+		pci_write_config_dword(pdev, 0x30, plxdma + 1);
+		pci_read_config_dword(pdev, 0x30, &plxdma);
+		plxdma &= ~15;
 
-		while ((pdev = pci_find_device(SE6_PCI_VENDOR_ID, SE6_PCI_DEVICE_ID, pdev)) != NULL)
-		{
-			/*
-			 * Get and check the bus-master and latency values.
-			 * Some PCI BIOSes fail to set the master-enable bit,
-			 * and the latency timer must be set to the maximum
-			 * value to avoid data corruption that occurs when the
-			 * timer expires during a transfer.  Yes, it's a bug.
-			 */
-			if (pci_enable_device(pdev))
-				continue;
-			pci_set_master(pdev);
+		dgrs_found_device(io, mem, irq, plxreg, plxdma);
 
-			plxreg = pci_resource_start (pdev, 0);
-			io = pci_resource_start (pdev, 1);
-			mem = pci_resource_start (pdev, 2);
-			pci_read_config_dword(pdev, 0x30, &plxdma);
-			irq = pdev->irq;
-			plxdma &= ~15;
-
-			/*
-			 * On some BIOSES, the PLX "expansion rom" (used for DMA)
-			 * address comes up as "0".  This is probably because
-			 * the BIOS doesn't see a valid 55 AA ROM signature at
-			 * the "ROM" start and zeroes the address.  To get
-			 * around this problem the SE-6 is configured to ask
-			 * for 4 MB of space for the dual port memory.  We then
-			 * must set its range back to 2 MB, and use the upper
-			 * half for DMA register access
-			 */
-			OUTL(io + PLX_SPACE0_RANGE, 0xFFE00000L);
-			if (plxdma == 0)
-				plxdma = mem + (2048L * 1024L);
-			pci_write_config_dword(pdev, 0x30, plxdma + 1);
-			pci_read_config_dword(pdev, 0x30, &plxdma);
-			plxdma &= ~15;
-
-			dgrs_found_device(io, mem, irq, plxreg, plxdma);
-
-			cards_found++;
-		}
+		cards_found++;
 	}
 
 	/*

diff -Nru a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c
@@ -285,8 +285,6 @@
 {
 	register __u16 found=0;
 	struct pci_dev *pcidev = NULL;
-	if(!pci_present())
-		return -ENODEV;
 	while(!found && (pcidev = pci_find_device(PCI_VENDOR_ESS, 
 						  PCI_DEVICE_ID_ESS_ESS1968,
 						  pcidev)))

diff -Nru a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c
@@ -4460,9 +4460,7 @@
     }
 
     /* scanning for PCI controllers */
-#if LINUX_VERSION_CODE >= 0x2015C
-    if (pci_present())
-#else
+#if LINUX_VERSION_CODE < 0x2015C
     if (pcibios_present())
 #endif
     {

diff -Nru a/drivers/scsi/pci2220i.c b/drivers/scsi/pci2220i.c
@@ -2534,12 +2534,6 @@
 	UCHAR				device;
 	struct pci_dev	   *pcidev = NULL;
 
-	if ( !pci_present () )
-		{
-		printk ("pci2220i: PCI BIOS not present\n");
-		return 0;
-		}
-
 	while ( (pcidev = pci_find_device (VENDOR_PSI, DEVICE_DALE_1, pcidev)) != NULL )
 		{
 		if (pci_enable_device(pcidev))

diff -Nru a/drivers/isdn/eicon/Divas_mod.c b/drivers/isdn/eicon/Divas_mod.c
@@ -50,17 +50,9 @@
 
 	DivasInitDpc();
 
-	if (pci_present())
+	if (DivasCardsDiscover() < 0)
 	{
-		if (DivasCardsDiscover() < 0)
-		{
-			printk(KERN_WARNING "Divas: Not loaded\n");
-			return -ENODEV;
-		}
-	}
-	else
-	{
-		printk(KERN_WARNING "Divas: No PCI bus present\n");
+		printk(KERN_WARNING "Divas: Not loaded\n");
 		return -ENODEV;
 	}
 

diff -Nru a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c
@@ -2379,12 +2379,6 @@
 
 	printk(KERN_WARNING "3ware Storage Controller device driver for Linux v%s.\n", tw_driver_version);
 
-	/* Check if the kernel has PCI interface compiled in */
-	if (!pci_present()) {
-		printk(KERN_WARNING "3w-xxxx: tw_scsi_detect(): No pci interface present.\n");
-		return 0;
-	}
-
 	ret = tw_findcards(tw_host);
 
 	return ret;

diff -Nru a/drivers/scsi/sym53c8xx_comm.h b/drivers/scsi/sym53c8xx_comm.h
@@ -319,8 +319,6 @@
 #define PciDeviceFn(d)		((d)&0xff)
 #define __PciDev(busn, devfn)	(((busn)<<8)+(devfn))
 
-#define pci_present pcibios_present
-
 #define pci_read_config_byte(d, w, v) \
 	pcibios_read_config_byte(PciBusNumber(d), PciDeviceFn(d), w, v)
 #define pci_read_config_word(d, w, v) \

@@ -2530,12 +2528,6 @@
 #ifdef SCSI_NCR_NVRAM_SUPPORT
 	ncr_nvram  nvram0, nvram, *nvp;
 #endif
-
-	/*
-	**    PCI is required.
-	*/
-	if (!pci_present())
-		return 0;
 
 #ifdef SCSI_NCR_DEBUG_INFO_SUPPORT
 	ncr_debug = driver_setup.debug;

diff -Nru a/sound/oss/sonicvibes.c b/sound/oss/sonicvibes.c
@@ -2723,8 +2723,6 @@
  
 static int __init init_sonicvibes(void)
 {
-	if (!pci_present())   /* No PCI bus in this machine! */
-		return -ENODEV;
 	printk(KERN_INFO "sv: version v0.31 time " __TIME__ " " __DATE__ "\n");
 #if 0
 	if (!(wavetable_mem = __get_free_pages(GFP_KERNEL, 20-PAGE_SHIFT)))

diff -Nru a/sound/oss/cs4281/cs4281m.c b/sound/oss/cs4281/cs4281m.c
@@ -4484,11 +4484,6 @@
 	int rtn = 0;
 	CS_DBGOUT(CS_INIT | CS_FUNCTION, 2, printk(KERN_INFO 
 		"cs4281: cs4281_init_module()+ \n"));
-	if (!pci_present()) {	/* No PCI bus in this machine! */
-		CS_DBGOUT(CS_INIT | CS_FUNCTION, 2, printk(KERN_INFO
-			"cs4281: cs4281_init_module()- no pci bus found\n"));
-		return -ENODEV;
-	}
 	printk(KERN_INFO "cs4281: version v%d.%02d.%d time " __TIME__ " "
 	       __DATE__ "\n", CS4281_MAJOR_VERSION, CS4281_MINOR_VERSION,
 	       CS4281_ARCH);

diff -Nru a/include/linux/pci.h b/include/linux/pci.h
@@ -525,9 +525,6 @@
 extern struct list_head pci_root_buses;	/* list of all known PCI buses */
 extern struct list_head pci_devices;	/* list of all devices */
 
-#define pci_for_each_bus(bus) \
-	for(bus = pci_bus_b(pci_root_buses.next); bus != pci_bus_b(&pci_root_buses); bus = pci_bus_b(bus->node.next))
-
 int pci_present(void);
 void pcibios_fixup_bus(struct pci_bus *);
 int pcibios_enable_device(struct pci_dev *, int mask);

diff -Nru a/drivers/net/acenic.c b/drivers/net/acenic.c
@@ -618,9 +618,6 @@
 		return -ENODEV;
 	probed++;
 
-	if (!pci_present())		/* is PCI support present? */
-		return -ENODEV;
-
 	version_disp = 0;
 
 	while ((pdev = pci_find_class(PCI_CLASS_NETWORK_ETHERNET<<8, pdev))) {

diff -Nru a/drivers/net/hp100.c b/drivers/net/hp100.c
@@ -405,7 +405,7 @@
 	/* First: scan PCI bus(es) */
 
 #ifdef CONFIG_PCI
-	if (pci_present()) {
+	{
 		int pci_index;
 		struct pci_dev *pci_dev = NULL;
 		int pci_id_index;

@@ -2973,8 +2973,10 @@
 {
 	int i, cards;
 
-	if (hp100_port == 0 && !EISA_bus && !pci_present())
+#ifndef CONFIG_PCI
+	if (hp100_port == 0 && !EISA_bus)
 		printk("hp100: You should not use auto-probing with insmod!\n");
+#endif
 
 	/* Loop on all possible base addresses */
 	i = -1;

diff -Nru a/drivers/pci/syscall.c b/drivers/pci/syscall.c
@@ -98,8 +98,6 @@
 
 	if (!capable(CAP_SYS_ADMIN))
 		return -EPERM;
-	if (!pci_present())
-		return -ENOSYS;
 
 	dev = pci_find_slot(bus, dfn);
 	if (!dev)

diff -Nru a/drivers/net/tc35815.c b/drivers/net/tc35815.c
@@ -488,9 +488,6 @@
 		return -ENODEV;
 	called++;
 
-	if (!pci_present())
-		return -ENODEV;
-
 	if (pdev) {
 		unsigned int pci_memaddr;
 		unsigned int pci_irq_line;

diff -Nru a/sound/oss/maestro3.c b/sound/oss/maestro3.c
@@ -2936,9 +2936,6 @@
 
 static int __init m3_init_module(void)
 {
-    if (!pci_present())   /* No PCI bus in this machine! */
-        return -ENODEV;
-
     printk(KERN_INFO PFX "version " DRIVER_VERSION " built at " __TIME__ " " __DATE__ "\n");
 
     if (register_reboot_notifier(&m3_reboot_nb)) {

diff -Nru a/drivers/scsi/cpqfcTSinit.c b/drivers/scsi/cpqfcTSinit.c
@@ -298,12 +298,6 @@
   ScsiHostTemplate->proc_name = "cpqfcTS";
 #endif
 
-  if( pci_present() == 0) // no PCI busses?
-  {
-    printk( "  no PCI bus?@#!\n");
-    return NumberOfAdapters;
-  }
-
   for( i=0; i < HBA_TYPES; i++)
   {
     // look for all HBAs of each type

diff -Nru a/sound/oss/es1371.c b/sound/oss/es1371.c
@@ -3043,8 +3043,6 @@
 
 static int __init init_es1371(void)
 {
-	if (!pci_present())   /* No PCI bus in this machine! */
-		return -ENODEV;
 	printk(KERN_INFO PFX "version v0.32 time " __TIME__ " " __DATE__ "\n");
 	return pci_module_init(&es1371_driver);
 }

diff -Nru a/arch/i386/pci/common.c b/arch/i386/pci/common.c
@@ -104,11 +104,9 @@
 
 struct pci_bus * __devinit pcibios_scan_root(int busnum)
 {
-	struct list_head *list;
-	struct pci_bus *bus;
+	struct pci_bus *bus = NULL;
 
-	list_for_each(list, &pci_root_buses) {
-		bus = pci_bus_b(list);
+	while ((bus = pci_find_next_bus(bus)) != NULL) {
 		if (bus->number == busnum) {
 			/* Already scanned */
 			return bus;

diff -Nru a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c
@@ -1183,7 +1183,7 @@
     If a PCI BIOS is present, interrogate it for MultiMaster and FlashPoint
     Host Adapters; otherwise, default to the standard ISA MultiMaster probe.
   */
-  if (!BusLogic_ProbeOptions.NoProbePCI && pci_present())
+  if (!BusLogic_ProbeOptions.NoProbePCI)
     {
       if (BusLogic_ProbeOptions.MultiMasterFirst)
 	{

@@ -5133,3 +5133,4 @@
 	.use_clustering		= ENABLE_CLUSTERING,
 };
 #include "scsi_module.c"
+

diff -Nru a/drivers/scsi/qlogicfc.c b/drivers/scsi/qlogicfc.c
@@ -711,11 +711,6 @@
 
 	tmpt->proc_name = "isp2x00";
 
-	if (pci_present() == 0) {
-		printk(KERN_INFO "qlogicfc : PCI not present\n");
-		return 0;
-	}
-
 	for (i=0; i<2; i++){
 		pdev = NULL;
 	        while ((pdev = pci_find_device(PCI_VENDOR_ID_QLOGIC, device_ids[i], pdev))) {

diff -Nru a/drivers/net/saa9730.c b/drivers/net/saa9730.c
@@ -1050,31 +1050,30 @@
 static int __init saa9730_probe(void)
 {
 	struct net_device *dev = NULL;
+	struct pci_dev *pdev = NULL;
 
-	if (pci_present()) {
-		struct pci_dev *pdev = NULL;
-		if (lan_saa9730_debug > 1)
-			printk
-			    ("saa9730.c: PCI bios is present, checking for devices...\n");
+	if (lan_saa9730_debug > 1)
+		printk
+		    ("saa9730.c: PCI bios is present, checking for devices...\n");
 
-		while ((pdev = pci_find_device(PCI_VENDOR_ID_PHILIPS,
-					       PCI_DEVICE_ID_PHILIPS_SAA9730,
-					       pdev))) {
-			unsigned int pci_ioaddr;
+	while ((pdev = pci_find_device(PCI_VENDOR_ID_PHILIPS,
+				       PCI_DEVICE_ID_PHILIPS_SAA9730,
+				       pdev))) {
+		unsigned int pci_ioaddr;
 
-			pci_irq_line = pdev->irq;
-			/* LAN base address in located at BAR 1. */
+		pci_irq_line = pdev->irq;
+		/* LAN base address in located at BAR 1. */
 
-			pci_ioaddr = pci_resource_start(pdev, 1);
-			pci_set_master(pdev);
+		pci_ioaddr = pci_resource_start(pdev, 1);
+		pci_set_master(pdev);
 
-			printk("Found SAA9730 (PCI) at %#x, irq %d.\n",
-			       pci_ioaddr, pci_irq_line);
-			if (!lan_saa9730_init
-			    (dev, pci_ioaddr, pci_irq_line)) return 0;
-			else
-				printk("Lan init failed.\n");
-		}
+		printk("Found SAA9730 (PCI) at %#x, irq %d.\n",
+		       pci_ioaddr, pci_irq_line);
+		if (!lan_saa9730_init
+		    (dev, pci_ioaddr, pci_irq_line))
+			return 0;
+		else
+			printk("Lan init failed.\n");
 	}
 
 	return -ENODEV;

diff -Nru a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c
@@ -263,9 +263,6 @@
 {
 	struct pci_dev  *pdev = NULL;
 
-	if( !pci_present( ) )
-		return  -ENODEV;
-
 	while( (pdev = pci_find_class( PCI_CLASS_NETWORK_OTHER << 8, pdev ))
 	       != NULL ) {
 		int  pci_irq_line;

diff -Nru a/drivers/isdn/hysdn/hysdn_init.c b/drivers/isdn/hysdn/hysdn_init.c
@@ -203,10 +203,6 @@
 	printk(KERN_NOTICE "HYSDN: module Rev: %s loaded\n", hysdn_getrev(tmp));
 	strcpy(tmp, hysdn_net_revision);
 	printk(KERN_NOTICE "HYSDN: network interface Rev: %s \n", hysdn_getrev(tmp));
-	if (!pci_present()) {
-		printk(KERN_ERR "HYSDN: no PCI bus present, module not loaded\n");
-		return (-1);
-	}
 	search_cards();
 	printk(KERN_INFO "HYSDN: %d card(s) found.\n", cardmax);
 

diff -Nru a/drivers/i2c/i2c-elektor.c b/drivers/i2c/i2c-elektor.c
@@ -188,7 +188,7 @@
 #ifdef __alpha__
 	/* check to see we have memory mapped PCF8584 connected to the 
 	Cypress cy82c693 PCI-ISA bridge as on UP2000 board */
-	if ((base == 0) && pci_present()) {
+	if (base == 0) {
 		
 		struct pci_dev *cy693_dev =
                     pci_find_device(PCI_VENDOR_ID_CONTAQ, 

diff -Nru a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c
@@ -2182,11 +2182,6 @@
 
     if (lastPCI == NO_MORE_PCI) return;
 
-    if (!pci_present()) {
-	lastPCI = NO_MORE_PCI;
-	return;          /* No PCI bus in this machine! */
-    }
-    
     lp->bus = PCI;
     lp->bus_num = 0;
 

@@ -5863,7 +5858,6 @@
 	if (EISA_signature(name, EISA_ID)) j++;
     }
 #endif
-    if (!pci_present()) return j;
 
     for (i=0; (pdev=pci_find_class(class, pdev))!= NULL; i++) {
 	vendor = pdev->vendor;

diff -Nru a/drivers/scsi/dmx3191d.c b/drivers/scsi/dmx3191d.c
@@ -58,11 +58,6 @@
 	struct Scsi_Host *instance = NULL;
 	struct pci_dev *pdev = NULL;
 
-	if (!pci_present()) {
-		printk(KERN_WARNING "dmx3191: PCI support not enabled\n");
-		return 0;
-	}
-
 	tmpl->proc_name = DMX3191D_DRIVER_NAME;
 
 	while ((pdev = pci_find_device(PCI_VENDOR_ID_DOMEX,

@@ -139,3 +134,4 @@
         .use_clustering		= DISABLE_CLUSTERING,
 };
 #include "scsi_module.c"
+

diff -Nru a/sound/oss/esssolo1.c b/sound/oss/esssolo1.c
@@ -2459,8 +2459,6 @@
 
 static int __init init_solo1(void)
 {
-	if (!pci_present())   /* No PCI bus in this machine! */
-		return -ENODEV;
 	printk(KERN_INFO "solo1: version v0.20 time " __TIME__ " " __DATE__ "\n");
 	if (!pci_register_driver(&solo1_driver)) {
 		pci_unregister_driver(&solo1_driver);