aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/hotplug/sgi_hotplug.c
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2012-05-17 18:58:41 -0700
committerBjorn Helgaas <bhelgaas@google.com>2012-06-13 15:42:27 -0600
commit69ba29b9f91317b0cb8a4891c0cc6270a6f77ec9 (patch)
treed62501e3e0009a939774e2cd915a7c2324967abf /drivers/pci/hotplug/sgi_hotplug.c
parentPCI: ibmhp: use generic pci_hp_add_bridge() (diff)
downloadlinux-dev-69ba29b9f91317b0cb8a4891c0cc6270a6f77ec9.tar.xz
linux-dev-69ba29b9f91317b0cb8a4891c0cc6270a6f77ec9.zip
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/pci/hotplug/sgi_hotplug.c')
-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)
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);
}