]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
PCI: sgihp: use generic pci_hp_add_bridge()
authorYinghai Lu <yinghai@kernel.org>
Fri, 18 May 2012 01:58:41 +0000 (18:58 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 13 Jun 2012 21:42:27 +0000 (15:42 -0600)
Use the new generic pci_hp_add_bridge() interface.

[bhelgaas: changelog]
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
drivers/pci/hotplug/sgi_hotplug.c

index b0bb3b537bb0facd406bc99381116d25b8668e31..f64ca92253da527ea49b84af968df516f53e43f0 100644 (file)
@@ -397,15 +397,11 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot)
                        else
                                sn_io_slot_fixup(dev);
                        if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) {
-                               unsigned char sec_bus;
-                               int max;
-                               pci_read_config_byte(dev, PCI_SECONDARY_BUS,
-                                                    &sec_bus);
-                               new_bus = pci_add_new_bus(dev->bus, dev,
-                                                         sec_bus);
-                               max = pci_scan_child_bus(new_bus);
-                               pci_bus_update_busn_res_end(new_bus, max);
-                               new_ppb = 1;
+                               pci_hp_add_bridge(dev);
+                               if (dev->subordinate) {
+                                       new_bus = dev->subordinate;
+                                       new_ppb = 1;
+                               }
                        }
                        pci_dev_put(dev);
                }