Browse Source

[PATCH] PCI: return max reserved busnr

Change the semantics of this call to return the max reserved
bus number instead of just the max assigned bus number.

Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Kristen Accardi 19 years ago
parent
commit
b82db5cedf
2 changed files with 4 additions and 2 deletions
  1. 3 2
      drivers/pci/pci.c
  2. 1 0
      include/linux/pci.h

+ 3 - 2
drivers/pci/pci.c

@@ -19,7 +19,6 @@
 #include <asm/dma.h>	/* isa_dma_bridge_buggy */
 #include <asm/dma.h>	/* isa_dma_bridge_buggy */
 #include "pci.h"
 #include "pci.h"
 
 
-#if 0
 
 
 /**
 /**
  * pci_bus_max_busnr - returns maximum PCI bus number of given bus' children
  * pci_bus_max_busnr - returns maximum PCI bus number of given bus' children
@@ -34,7 +33,7 @@ pci_bus_max_busnr(struct pci_bus* bus)
 	struct list_head *tmp;
 	struct list_head *tmp;
 	unsigned char max, n;
 	unsigned char max, n;
 
 
-	max = bus->number;
+	max = bus->subordinate;
 	list_for_each(tmp, &bus->children) {
 	list_for_each(tmp, &bus->children) {
 		n = pci_bus_max_busnr(pci_bus_b(tmp));
 		n = pci_bus_max_busnr(pci_bus_b(tmp));
 		if(n > max)
 		if(n > max)
@@ -42,7 +41,9 @@ pci_bus_max_busnr(struct pci_bus* bus)
 	}
 	}
 	return max;
 	return max;
 }
 }
+EXPORT_SYMBOL_GPL(pci_bus_max_busnr);
 
 
+#if 0
 /**
 /**
  * pci_max_busnr - returns maximum PCI bus number
  * pci_max_busnr - returns maximum PCI bus number
  *
  *

+ 1 - 0
include/linux/pci.h

@@ -516,6 +516,7 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max, int pass
 void pci_walk_bus(struct pci_bus *top, void (*cb)(struct pci_dev *, void *),
 void pci_walk_bus(struct pci_bus *top, void (*cb)(struct pci_dev *, void *),
 		  void *userdata);
 		  void *userdata);
 int pci_cfg_space_size(struct pci_dev *dev);
 int pci_cfg_space_size(struct pci_dev *dev);
+unsigned char pci_bus_max_busnr(struct pci_bus* bus);
 
 
 /* kmem_cache style wrapper around pci_alloc_consistent() */
 /* kmem_cache style wrapper around pci_alloc_consistent() */