Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

PCI: cpci_hotplug: 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 c6da81a4d3
commit 073ae10c0f
1 changed files with 6 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
drivers/pci/hotplug/cpci_hotplug_pci.c
View file

@ -285,44 +285,19 @@ int __ref cpci_configure_slot(struct slot *slot)
for (fn = 0; fn < 8; fn++) { for (fn = 0; fn < 8; fn++) {
struct pci_dev *dev; struct pci_dev *dev;
dev = pci_get_slot(parent, PCI_DEVFN(PCI_SLOT(slot->devfn), fn)); dev = pci_get_slot(parent,
PCI_DEVFN(PCI_SLOT(slot->devfn), fn));
if (!dev) if (!dev)
continue; continue;
if ((dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) || if ((dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) ||
(dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)) { (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS))
/* Find an unused bus number for the new bridge */ pci_hp_add_bridge(dev);
struct pci_bus *child;
unsigned char busnr, start = parent->busn_res.start;
unsigned char end = parent->busn_res.end;
int max;
for (busnr = start; busnr <= end; busnr++) {
if (!pci_find_bus(pci_domain_nr(parent),
busnr))
break;
}
if (busnr >= end) {
err("No free bus for hot-added bridge\n");
pci_dev_put(dev);
continue;
}
child = pci_add_new_bus(parent, dev, busnr);
if (!child) {
err("Cannot add new bus for %s\n",
pci_name(dev));
pci_dev_put(dev);
continue;
}
max = pci_do_scan_bus(child);
pci_bus_update_busn_res_end(child, max);
pci_bus_size_bridges(child);
}
pci_dev_put(dev); pci_dev_put(dev);
} }
pci_bus_assign_resources(parent); pci_assign_unassigned_bridge_resources(parent->self);
pci_bus_add_devices(parent); pci_bus_add_devices(parent);
pci_enable_bridges(parent);
dbg("%s - exit", __func__); dbg("%s - exit", __func__);
return 0; return 0;