Commit 2d7abf32 authored by Yinghai Lu's avatar Yinghai Lu Committed by Bjorn Helgaas

PCI: ibmhp: use generic pci_hp_add_bridge()

Use the new generic pci_hp_add_bridge() interface.

[bhelgaas: changelog]
Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 04de975e
...@@ -775,7 +775,6 @@ static u8 bus_structure_fixup(u8 busno) ...@@ -775,7 +775,6 @@ static u8 bus_structure_fixup(u8 busno)
static int ibm_configure_device(struct pci_func *func) static int ibm_configure_device(struct pci_func *func)
{ {
unsigned char bus;
struct pci_bus *child; struct pci_bus *child;
int num; int num;
int flag = 0; /* this is to make sure we don't double scan the bus, int flag = 0; /* this is to make sure we don't double scan the bus,
...@@ -805,11 +804,10 @@ static int ibm_configure_device(struct pci_func *func) ...@@ -805,11 +804,10 @@ static int ibm_configure_device(struct pci_func *func)
} }
} }
if (!(flag) && (func->dev->hdr_type == PCI_HEADER_TYPE_BRIDGE)) { if (!(flag) && (func->dev->hdr_type == PCI_HEADER_TYPE_BRIDGE)) {
int max; pci_hp_add_bridge(func->dev);
pci_read_config_byte(func->dev, PCI_SECONDARY_BUS, &bus); child = func->dev->subordinate;
child = pci_add_new_bus(func->dev->bus, func->dev, bus); if (child)
max = pci_do_scan_bus(child); pci_bus_add_devices(child);
pci_bus_update_busn_res_end(child, max);
} }
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment