PCI: make pci_bus a struct device

This moves the pci_bus class device to be a real struct device and at
the same time, place it in the device tree in the correct location.

Note, the old "bridge" symlink is now gone, but this was a non-standard
link and no userspace program used it.  If you need to determine the
device that the bus is on, follow the standard device symlink, or walk
up the device tree.


Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 13 insertions, 4 deletions

diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index 863340a7b77f..ef5a6a245f5f 100644
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c
@@ -108,6 +108,7 @@ int pci_bus_add_device(struct pci_dev *dev)
 void pci_bus_add_devices(struct pci_bus *bus)
 {
         struct pci_dev *dev;
+        struct pci_bus *child_bus;
         int retval;
 
         list_for_each_entry(dev, &bus->devices, bus_list) {
@@ -138,11 +139,19 @@ void pci_bus_add_devices(struct pci_bus *bus)
                                up_write(&pci_bus_sem);
                         }
                         pci_bus_add_devices(dev->subordinate);
-                        retval = sysfs_create_link(&dev->subordinate->class_dev.kobj,
-                                                   &dev->dev.kobj, "bridge");
+
+                        /* register the bus with sysfs as the parent is now
+                         * properly registered. */
+                        child_bus = dev->subordinate;
+                        child_bus->dev.parent = child_bus->bridge;
+                        retval = device_register(&child_bus->dev);
+                        if (!retval)
+                                retval = device_create_file(&child_bus->dev,
+                                                        &dev_attr_cpuaffinity);
                         if (retval)
-                                dev_err(&dev->dev, "Error creating sysfs "
-                                        "bridge symlink, continuing...\n");
+                                dev_err(&dev->dev, "Error registering pci_bus"
+                                        " device bridge symlink,"
+                                        " continuing...\n");
                 }
         }
 }