iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PCI: ibmhp: use generic pci_hp_add_bridge()

Browse Source 
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>
This commit is contained in:
Yinghai Lu 2012-05-17 18:58:41 -07:00 committed by Bjorn Helgaas
parent 04de975e78
commit 2d7abf3292
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/pci/hotplug/ibmphp_core.c
View File

@ -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)
} }
} }
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;