aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2012-05-17 21:58:41 -0400
committerBjorn Helgaas <bhelgaas@google.com>2012-06-13 17:42:27 -0400
commit69ba29b9f91317b0cb8a4891c0cc6270a6f77ec9 (patch)
treed62501e3e0009a939774e2cd915a7c2324967abf /drivers
parent2d7abf32925f1a8aeeb37234c8ea7590ebbe62be (diff)
PCI: sgihp: use generic pci_hp_add_bridge()
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/hotplug/sgi_hotplug.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/pci/hotplug/sgi_hotplug.c b/drivers/pci/hotplug/sgi_hotplug.c
index b0bb3b537bb0..f64ca92253da 100644
--- a/drivers/pci/hotplug/sgi_hotplug.c
+++ b/drivers/pci/hotplug/sgi_hotplug.c
@@ -397,15 +397,11 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot)
397 else 397 else
398 sn_io_slot_fixup(dev); 398 sn_io_slot_fixup(dev);
399 if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) { 399 if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) {
400 unsigned char sec_bus; 400 pci_hp_add_bridge(dev);
401 int max; 401 if (dev->subordinate) {
402 pci_read_config_byte(dev, PCI_SECONDARY_BUS, 402 new_bus = dev->subordinate;
403 &sec_bus); 403 new_ppb = 1;
404 new_bus = pci_add_new_bus(dev->bus, dev, 404 }
405 sec_bus);
406 max = pci_scan_child_bus(new_bus);
407 pci_bus_update_busn_res_end(new_bus, max);
408 new_ppb = 1;
409 } 405 }
410 pci_dev_put(dev); 406 pci_dev_put(dev);
411 } 407 }