Re: [PATCH] More PCI fixes for 2.5.70

[Greg KH]

ChangeSet 1.1317, 2003/06/05 12:04:33-07:00, [e-mail]

[PATCH] PCI: move pci_present() into drivers/pci/search.c

This will let not have to export the pci_devices variable.

 drivers/pci/search.c |   11 +++++++++++
 include/linux/pci.h  |    6 +-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff -Nru a/drivers/pci/search.c b/drivers/pci/search.c
--- a/drivers/pci/search.c	Thu Jun  5 13:52:43 2003
+++ b/drivers/pci/search.c	Thu Jun  5 13:52:43 2003
@@ -171,9 +171,20 @@
 	return NULL;
 }
 
+/**
+ * pci_present - determine if there are any pci devices on this system
+ *
+ * Returns 0 if no pci devices are present, 1 if pci devices are present.
+ */
+int pci_present(void)
+{
+	return !list_empty(&pci_devices);
+}
+
 EXPORT_SYMBOL(pci_find_bus);
 EXPORT_SYMBOL(pci_find_class);
 EXPORT_SYMBOL(pci_find_device);
 EXPORT_SYMBOL(pci_find_device_reverse);
 EXPORT_SYMBOL(pci_find_slot);
 EXPORT_SYMBOL(pci_find_subsys);
+EXPORT_SYMBOL(pci_present);
diff -Nru a/include/linux/pci.h b/include/linux/pci.h
--- a/include/linux/pci.h	Thu Jun  5 13:52:43 2003
+++ b/include/linux/pci.h	Thu Jun  5 13:52:43 2003
@@ -522,14 +522,10 @@
 /* these external functions are only available when PCI support is enabled */
 #ifdef CONFIG_PCI
 
-static inline int pci_present(void)
-{
-	return !list_empty(&pci_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);
 char *pcibios_setup (char *str);