allow pci primary busses to have parents in the device model

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 118611ea603f23ddfb1fc6c90b1a9a676c898bc3..a9064b0ffea8c963b6df00eeaaa342858e05f16b 100644 (file)
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -548,7 +548,7 @@ int __devinit pci_bus_exists(const struct list_head *list, int nr)
        return 0;
 }
 
-struct pci_bus * __devinit pci_alloc_primary_bus(int bus)
+struct pci_bus * __devinit pci_alloc_primary_bus_parented(struct device *parent, int bus)
 {
        struct pci_bus *b;
 
@@ -567,6 +567,7 @@ struct pci_bus * __devinit pci_alloc_primary_bus(int bus)
        memset(b->dev,0,sizeof(*(b->dev)));
        sprintf(b->dev->bus_id,"pci%d",bus);
        strcpy(b->dev->name,"Host/PCI Bridge");
+       b->dev->parent = parent;
        device_register(b->dev);
 
        b->number = b->secondary = bus;
@@ -575,9 +576,9 @@ struct pci_bus * __devinit pci_alloc_primary_bus(int bus)
        return b;
 }
 
-struct pci_bus * __devinit pci_scan_bus(int bus, struct pci_ops *ops, void *sysdata)
+struct pci_bus * __devinit pci_scan_bus_parented(struct device *parent, int bus, struct pci_ops *ops, void *sysdata)
 {
-       struct pci_bus *b = pci_alloc_primary_bus(bus);
+       struct pci_bus *b = pci_alloc_primary_bus_parented(parent, bus);
        if (b) {
                b->sysdata = sysdata;
                b->ops = ops;

diff --git a/include/linux/pci.h b/include/linux/pci.h
index b4265360d2ec5ca4772b4fe5050680a9e60adfeb..3fa2415457291a3665ba9ec35daac5f8108f2339 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -558,8 +558,16 @@ void pcibios_fixup_pbus_ranges(struct pci_bus *, struct pbus_set_ranges_data *);
 /* Generic PCI functions used internally */
 
 int pci_bus_exists(const struct list_head *list, int nr);
-struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops, void *sysdata);
-struct pci_bus *pci_alloc_primary_bus(int bus);
+struct pci_bus *pci_scan_bus_parented(struct device *parent, int bus, struct pci_ops *ops, void *sysdata);
+static inline struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops, void *sysdata)
+{
+       return pci_scan_bus_parented(NULL, bus, ops, sysdata);
+}
+struct pci_bus *pci_alloc_primary_bus_parented(struct device * parent, int bus);
+static inline struct pci_bus *pci_alloc_primary_bus(int bus)
+{
+       return pci_alloc_primary_bus_parented(NULL, bus);
+}
 struct pci_dev *pci_scan_slot(struct pci_dev *temp);
 int pci_proc_attach_device(struct pci_dev *dev);
 int pci_proc_detach_device(struct pci_dev *dev);